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 | 548d16869acffdec899121906a7bcd88f58d9b6f (patch) | |
| tree | 8107dc0f2f3a691deaaf02adf2cc6705f5a70763 /source3/smbd/posix_acls.c | |
| parent | 1475474425c07d6e0a997793ab6b078ffdf466d9 (diff) | |
| download | samba-548d16869acffdec899121906a7bcd88f58d9b6f.tar.gz samba-548d16869acffdec899121906a7bcd88f58d9b6f.tar.bz2 samba-548d16869acffdec899121906a7bcd88f58d9b6f.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.
(This used to be commit 7792e32ba7fd734cc68b354f31c382ac11521fe8)
Diffstat (limited to 'source3/smbd/posix_acls.c')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 0c613e8835..bf8716d713 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -468,6 +468,9 @@ static mode_t apply_default_perms(files_struct *fsp, mode_t perms, mode_t type) mode_t and_bits = (mode_t)0; mode_t or_bits = (mode_t)0; + if (!lp_restrict_acl_with_mask(snum)) + return perms; + /* Get the initial bits to apply. */ if (fsp->is_directory) { @@ -1173,6 +1176,9 @@ static mode_t create_default_mode(files_struct *fsp, BOOL interitable_mode) if (fsp->is_directory) mode |= (S_IWUSR|S_IXUSR); + if (!lp_restrict_acl_with_mask(snum)) + return mode; + /* * Now AND with the create mode/directory mode bits then OR with the * force create mode/force directory mode bits. |