diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-12-17 18:30:44 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2006-12-17 18:30:44 +0000 |
| commit | 7af40262e15a88dd90d55230f2e8b71dca43b1ea (patch) | |
| tree | 851a6cfc092c4c9cb4703caa630ed9b60762f8e5 /source/smbd/trans2.c | |
| parent | a61a75bf6192ede613f7e95496ffe4162b9f41f1 (diff) | |
| download | samba-7af40262e15a88dd90d55230f2e8b71dca43b1ea.tar.gz samba-7af40262e15a88dd90d55230f2e8b71dca43b1ea.tar.xz samba-7af40262e15a88dd90d55230f2e8b71dca43b1ea.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/trans2.c')
| -rw-r--r-- | source/smbd/trans2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 2f4bcb414fd..d15ca6d3274 100644 --- a/source/smbd/trans2.c +++ b/source/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); |