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 | 9933b596d1dddca68a7bcc611e1f8cffc7f2a4e6 (patch) | |
tree | 4ccd0403d7ef5be8c7b19c7365af93e1f966349e /source3/smbd/posix_acls.c | |
parent | 771f5956937a1697b05ea29a00b9fdd36022188f (diff) | |
download | samba-9933b596d1dddca68a7bcc611e1f8cffc7f2a4e6.tar.gz samba-9933b596d1dddca68a7bcc611e1f8cffc7f2a4e6.tar.bz2 samba-9933b596d1dddca68a7bcc611e1f8cffc7f2a4e6.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
(This used to be commit 0874093e5fff480d8ec442072318525079add633)
Diffstat (limited to 'source3/smbd/posix_acls.c')
-rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index f17594c079..75605ace8a 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -3457,8 +3457,8 @@ int chmod_acl(connection_struct *conn, const char *name, mode_t mode) } /**************************************************************************** - If "inherit permissions" is set and the parent directory has no default - ACL but it does have an Access ACL, inherit this Access ACL to file name. + If the parent directory has no default ACL but it does have an Access ACL, + inherit this Access ACL to file name. ****************************************************************************/ int inherit_access_acl(connection_struct *conn, const char *name, mode_t mode) @@ -3466,7 +3466,7 @@ int inherit_access_acl(connection_struct *conn, const char *name, mode_t mode) pstring dirname; pstrcpy(dirname, parent_dirname(name)); - if (!lp_inherit_perms(SNUM(conn)) || directory_has_default_acl(conn, dirname)) + if (directory_has_default_acl(conn, dirname)) return 0; return copy_access_acl(conn, dirname, name, mode); |