Fix a problem when reading username.mappings

diff --git a/Changelog b/Changelog
index e969f81d45a3511fb9da83af3c14e41c1ac46b9d..91a591f191de7a9222e91397b3242d27e6cc3f7e 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ Ver 1.78:
   user_finger.php3
 * Add a header with the page encoding before sending any page (header added in config.php3)
   This closes Bug #153
+* Fix a problem when reading username.mappings
 Ver 1.75:
 * A LOT of security related fixes. Now dialupadmin should hopefully be secure enough to
   be accessed by normal users (not administrators).

diff --git a/conf/admin.conf b/conf/admin.conf
index f3535dfaf80540c7ce743fddf8301d52910d3a47..ca1cf04556bc0bdfdbbd93b22458d40b0ff7dc2c 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -46,7 +46,7 @@ general_most_recent_fl: 30
 #
 # Set general_strip_realms to yes in order  to stip realms from usernames.
 # By default realms are not striped
-#general_strip_realms : yes
+#general_strip_realms: yes
 #
 # The delimiter used  in realms. Default is @
 #

diff --git a/conf/config.php3 b/conf/config.php3
index 312f7db2cee99f53c2c2a5116a64fcd8a2056708..cde0b57c87c982681d1a0f53b47290473e7cfb37 100644 (file)
--- a/conf/config.php3
+++ b/conf/config.php3
@@ -89,7 +89,7 @@ if (!isset($mappings) && $config[general_username_mappings_file] != ''){
                $val=chop($val);
                if (ereg('^[[:space:]]*#',$val) || ereg('^[[:space:]]*$',$val))
                        continue;
-               list($key,$realm,$v)=split(":[[:space:]]*",$val,2);
+               list($key,$realm,$v)=split(":[[:space:]]*",$val,3);
                if ($realm == 'accounting' || $realm == 'userdb' || $realm == 'nasdb' || $realm == 'nasadmin')
                        $mappings["$key"][$realm] = $v;
                if ($realm == 'nasdb'){