r18182: only grant privs to Administrators if privileges are enabled to avoid bopgus...

(This used to be commit 7d5356fd5db6ece2504c9c140d1f454056be7164)

diff --git a/source3/lib/account_pol.c b/source3/lib/account_pol.c
index de5a37aea91b562ea82efe29e36db6ea1c71e08f..e6ef8dbbe4b3be3b93bed9d06aae54fc6fd118f2 100644 (file)
--- a/source3/lib/account_pol.c
+++ b/source3/lib/account_pol.c
@@ -303,8 +303,11 @@ BOOL init_account_policy(void)
 
        /* BUILTIN\Administrators get everything -- *always* */
 
-       if ( !grant_all_privileges( &global_sid_Builtin_Administrators ) ) {
-               DEBUG(0,("init_account_policy: Failed to grant privileges to BUILTIN\\Administrators!\n"));
+       if ( lp_enable_privileges() ) {
+               if ( !grant_all_privileges( &global_sid_Builtin_Administrators ) ) {
+                       DEBUG(1,("init_account_policy: Failed to grant privileges "
+                               "to BUILTIN\\Administrators!\n"));
+               }
        }
 
        return True;