summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-11-24 15:28:11 -0800
committerJeremy Allison <jra@samba.org>2008-11-24 15:28:11 -0800
commit2c458935933daf219be276b06c6eb1b5752f2638 (patch)
treee481f7ec122e8c2e0428adf7925d67f995a727c2 /source3/smbd
parent51b840a07e84ab342f7b116171519219b3f9b1e1 (diff)
downloadsamba-2c458935933daf219be276b06c6eb1b5752f2638.tar.gz
samba-2c458935933daf219be276b06c6eb1b5752f2638.tar.bz2
samba-2c458935933daf219be276b06c6eb1b5752f2638.zip
Fix bug #5873 - ACL inheritance cannot be broken. This regresses #4308, but that will have to
be fixed another way. Jeremy.
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/posix_acls.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 7ca2ed787b..0529d2765e 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3211,6 +3211,9 @@ int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
return ret;
}
+#if 0
+/* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
/****************************************************************************
Take care of parent ACL inheritance.
****************************************************************************/
@@ -3398,6 +3401,7 @@ NTSTATUS append_parent_acl(files_struct *fsp,
*pp_new_sd = psd;
return status;
}
+#endif
/****************************************************************************
Reply to set a security descriptor on an fsp. security_info_sent is the
@@ -3510,6 +3514,9 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC
create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
+#if 0
+ /* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
/* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx
* for details and also the log trace in bug #4308. JRA.
*/
@@ -3527,6 +3534,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC
}
psd = new_sd;
}
+#endif
acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
&file_ace_list, &dir_ace_list, security_info_sent, psd);