Fix a problem when reading username.mappings

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index e969f81..91a591f 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/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/dialup_admin/conf/admin.conf b/dialup_admin/conf/admin.conf
index f3535df..ca1cf04 100644 (file)
--- a/dialup_admin/conf/admin.conf
+++ b/dialup_admin/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/dialup_admin/conf/config.php3 b/dialup_admin/conf/config.php3
index 312f7db..cde0b57 100644 (file)
--- a/dialup_admin/conf/config.php3
+++ b/dialup_admin/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'){