summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-12-17 18:30:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:34 -0500
commit9933b596d1dddca68a7bcc611e1f8cffc7f2a4e6 (patch)
tree4ccd0403d7ef5be8c7b19c7365af93e1f966349e /source3
parent771f5956937a1697b05ea29a00b9fdd36022188f (diff)
downloadsamba-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')
-rw-r--r--source3/smbd/open.c4
-rw-r--r--source3/smbd/posix_acls.c6
-rw-r--r--source3/smbd/trans2.c5
-rw-r--r--source3/smbd/vfs.c4
4 files changed, 13 insertions, 6 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3d5dd849b6..d916609769 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -283,7 +283,9 @@ static NTSTATUS open_file(files_struct *fsp,
}
/* Inherit the ACL if the file was created. */
- if ((local_flags & O_CREAT) && !file_existed) {
+ if ((local_flags & O_CREAT)
+ && !file_existed
+ && lp_inherit_perms(SNUM(conn))) {
inherit_access_acl(conn, fname, unx_mode);
}
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);
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);
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index ab9ddef9ff..b6a7d477bd 100644
--- a/source3/smbd/vfs.c
+++ b/source3/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,