Set the general_username_mappings_file variable

diff --git a/Changelog b/Changelog
index 828091639943361836b24ded160edce111248243..4458ed043e3175d040ec2b361254ed463027ca23 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -18,6 +18,7 @@ Ver 1.72:
 * Add a missing.php3 file with functions that may be missing from the PHP version used. Include it
   if a function is missing. Currently only array_change_key_case() is included
 * Set general_restrict_nasadmin_access to no by default. It causes confusion.
+* Set the general_username_mappings_file variable
 Ver 1.70:
 * Add the /bin postgresql compatibility patch from Guy Fraser
 * Add ldap_userdn as a configuration directive. If set we use that for

diff --git a/conf/admin.conf b/conf/admin.conf
index 164d374a52e015824ed7f3c9194684561a46e0ed..2bd5b5d978c671c774dee92bdbdc4682712e8a4d 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -71,6 +71,7 @@ general_clients_conf: /usr/local/etc/raddb/clients.conf
 general_sql_attrmap: %{general_base_dir}/conf/sql.attrmap
 general_accounting_attrs_file: %{general_base_dir}/conf/accounting.attrs
 general_extra_ldap_attrmap: %{general_base_dir}/conf/extra.ldap-attrmap
+general_username_mappings_file: %{general_base_dir}/conf/username.mappings
 #
 # it can be either ldap or sql
 # This affects the user base not accounting. Accounting is always in sql