From 9933b596d1dddca68a7bcc611e1f8cffc7f2a4e6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 17 Dec 2006 18:30:44 +0000 Subject: 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) --- source3/smbd/trans2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/smbd/trans2.c') 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); -- cgit