diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-12-17 18:30:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:34 -0500 |
| commit | 0874093e5fff480d8ec442072318525079add633 (patch) | |
| tree | b7918f41b829b5f453ea04009a9483ff99b5f138 /source/smbd/vfs.c | |
| parent | b24cf79e9ec914ac33f1a20524e5ffa7fe1cba5e (diff) | |
| download | samba-0874093e5fff480d8ec442072318525079add633.tar.gz samba-0874093e5fff480d8ec442072318525079add633.tar.xz samba-0874093e5fff480d8ec442072318525079add633.zip | |
r20228: Bring the calling conventions of inherit_access_acl and change_owner_to_parent
a bit closer together: Move the lp_inherit_perms() check into the callers.
Volker
Diffstat (limited to 'source/smbd/vfs.c')
| -rw-r--r-- | source/smbd/vfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c index ab9ddef9fff..b6a7d477bd9 100644 --- a/source/smbd/vfs.c +++ b/source/smbd/vfs.c @@ -319,7 +319,9 @@ int vfs_MkDir(connection_struct *conn, const char *name, mode_t mode) return ret; } - inherit_access_acl(conn, name, mode); + if (lp_inherit_perms(SNUM(conn))) { + inherit_access_acl(conn, name, mode); + } /* * Check if high bits should have been set, |