Set general_restrict_nasadmin_access to no by default. It causes confusion.

diff --git a/Changelog b/Changelog
index 3338b0429ba29fcec65d2fadbca31f336c55490e..828091639943361836b24ded160edce111248243 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -17,6 +17,7 @@ Ver 1.72:
 * Add debug statements in sql connect functions
 * 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.
 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 16ccabf58074a859145c737bf57d4c8bb0700963..164d374a52e015824ed7f3c9194684561a46e0ed 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -146,7 +146,7 @@ general_restrict_badusers_access: no
 # If set to yes then we restrict access to the nas administration page only to those
 # users which are allowed by their username mapping (nasadmin is set to yes)
 #
-general_restrict_nasadmin_access: yes
+general_restrict_nasadmin_access: no
 
 
 INCLUDE: %{general_base_dir}/conf/naslist.conf
@@ -265,6 +265,13 @@ sql_debug: true
 #
 # If set the query will be added to all of the queries on the accounting
 # table
+# Variables supported:
+# %u: username
+# %U: username provided though http authentication
+# %mu: mappings for userdb
+# %ma: mappings for accounting
+# %mn: mappings for nasdb
+# %mN: mappings for nas administration
 #sql_accounting_extra_query: %ma