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/trans2.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/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 2f4bcb414f..d15ca6d327 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -4307,7 +4307,10 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", if (SMB_VFS_MKNOD(conn,fname, unixmode, dev) != 0) return(UNIXERROR(ERRDOS,ERRnoaccess)); - inherit_access_acl(conn, fname, unixmode); + if (lp_inherit_perms(SNUM(conn))) { + inherit_access_acl(conn, fname, + unixmode); + } SSVAL(params,0,0); send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes); |