diff options
author | Jeremy Allison <jra@samba.org> | 2001-05-03 19:47:30 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-05-03 19:47:30 +0000 |
commit | 7792e32ba7fd734cc68b354f31c382ac11521fe8 (patch) | |
tree | 6292c926fb3d86ca81455cc074b1310e0298609e /source/param | |
parent | 409b1e4d1b996b26eee80bf5cb4edd962e4a4c76 (diff) | |
download | samba-7792e32ba7fd734cc68b354f31c382ac11521fe8.tar.gz samba-7792e32ba7fd734cc68b354f31c382ac11521fe8.tar.xz samba-7792e32ba7fd734cc68b354f31c382ac11521fe8.zip |
Fixed SHM_R/SHM_W warnings by moving sys/ipc.h and sys/shm.h into includes.h
and using autoconf tests.
Added "restrict acl with mask" parameter.
Jeremy.
Diffstat (limited to 'source/param')
-rw-r--r-- | source/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 75468ab0743..50e2450684e 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -395,6 +395,7 @@ typedef struct BOOL bBlockingLocks; BOOL bInheritPerms; BOOL bMSDfsRoot; + BOOL bRestrictAclWithMask; char dummy[3]; /* for alignment */ } @@ -508,6 +509,7 @@ static service sDefault = { True, /* bBlockingLocks */ False, /* bInheritPerms */ False, /* bMSDfsRoot */ + False, /* bRestrictAclWithMask */ "" /* dummy */ }; @@ -791,6 +793,7 @@ static struct parm_struct parm_table[] = { {"nt smb support", P_BOOL, P_GLOBAL, &Globals.bNTSmbSupport, NULL, NULL, 0}, {"nt pipe support", P_BOOL, P_GLOBAL, &Globals.bNTPipeSupport, NULL, NULL, 0}, {"nt acl support", P_BOOL, P_GLOBAL, &Globals.bNTAclSupport, NULL, NULL, 0}, + {"restrict acl with mask", P_BOOL, P_LOCAL, &sDefault.bRestrictAclWithMask, NULL, NULL, FLAG_SHARE}, {"announce version", P_STRING, P_GLOBAL, &Globals.szAnnounceVersion, NULL, NULL, 0}, {"announce as", P_ENUM, P_GLOBAL, &Globals.announce_as, NULL, enum_announce_as, 0}, {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, 0}, @@ -1674,6 +1677,7 @@ FN_LOCAL_BOOL(lp_dos_filetime_resolution, bDosFiletimeResolution) 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_restrict_acl_with_mask, bRestrictAclWithMask) 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) |