From 812dcab195504301faea7443f1cb900dea57a823 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 12 Oct 2001 22:00:38 +0000
Subject: Made nt acl support a local parameter for w2ksp2 profile fix. Jeremy.
 (This used to be commit ebba334c15619610475a5c8242a55ed4fcdedf7c)

---
 source3/param/loadparm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/param/loadparm.c')

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 63bc16e394..e011f47df6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -254,7 +254,6 @@ typedef struct
 	BOOL bTimestampLogs;
 	BOOL bNTSmbSupport;
 	BOOL bNTPipeSupport;
-	BOOL bNTAclSupport;
 	BOOL bStatCache;
 	BOOL bKernelOplocks;
 	BOOL bAllowTrustedDomains;
@@ -388,6 +387,7 @@ typedef struct
 	BOOL bInheritPerms;
 	BOOL bMSDfsRoot;
 	BOOL bUseClientDriver;
+	BOOL bNTAclSupport;
 
 	char dummy[3];		/* for alignment */
 }
@@ -502,6 +502,7 @@ static service sDefault = {
 	False,			/* bInheritPerms */
 	False,			/* bMSDfsRoot */
 	False,			/* bUseClientDriver */
+	True,			/* bNTAclSupport */
 
 	""			/* dummy */
 };
@@ -783,7 +784,7 @@ static struct parm_struct parm_table[] = {
 	{N_("write raw"), P_BOOL, P_GLOBAL, &Globals.bWriteRaw, NULL, NULL, 0},
 	
 	{N_("nt pipe support"), P_BOOL, P_GLOBAL, &Globals.bNTPipeSupport, NULL, NULL, 0},
-	{N_("nt acl support"), P_BOOL, P_GLOBAL, &Globals.bNTAclSupport, NULL, NULL, 0},
+	{N_("nt acl support"), P_BOOL,  P_LOCAL, &sDefault.bNTAclSupport, NULL, NULL, 0},
 	{N_("announce version"), P_STRING, P_GLOBAL, &Globals.szAnnounceVersion, NULL, NULL, 0},
 	{N_("announce as"), P_ENUM, P_GLOBAL, &Globals.announce_as, NULL, enum_announce_as, 0},
 	{N_("max mux"), P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, 0},
@@ -1280,7 +1281,6 @@ static void init_globals(void)
 	Globals.bPasswdChatDebug = False;
 	Globals.bUnicode = True;	/* Do unicode on the wire by default */
 	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
-	Globals.bNTAclSupport = True;	/* Use NT ACLs by default. */
 	Globals.bStatCache = True;	/* use stat cache by default */
 	Globals.bRestrictAnonymous = False;
 	Globals.bLanmanAuth = True;	/* Do use the LanMan hash if it is available */
@@ -1570,7 +1570,6 @@ FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
 FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
 FN_GLOBAL_BOOL(lp_unicode, &Globals.bUnicode)
 FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport)
-FN_GLOBAL_BOOL(lp_nt_acl_support, &Globals.bNTAclSupport)
 FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
 FN_GLOBAL_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
 FN_GLOBAL_BOOL(lp_restrict_anonymous, &Globals.bRestrictAnonymous)
@@ -1699,6 +1698,7 @@ FN_LOCAL_BOOL(lp_fake_dir_create_times, bFakeDirCreateTimes)
 FN_LOCAL_BOOL(lp_blocking_locks, bBlockingLocks)
 FN_LOCAL_BOOL(lp_inherit_perms, bInheritPerms)
 FN_LOCAL_BOOL(lp_use_client_driver, bUseClientDriver)
+FN_LOCAL_BOOL(lp_nt_acl_support, bNTAclSupport)
 FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
 FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
 FN_LOCAL_INTEGER(lp_security_mask, iSecurity_mask)
-- 
cgit