[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3193-gdbc9acf

Jeremy Allison jra at samba.org
Mon Nov 24 23:30:10 GMT 2008


The branch, v3-2-test has been updated
       via  dbc9acf637397766fa663358424af5342c628d5e (commit)
      from  93dd57627795b92b3d3f723a105271aead395dd1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit dbc9acf637397766fa663358424af5342c628d5e
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 24 15:29:17 2008 -0800

    Fix bug #5873 - ACL inheritance cannot be broken. This regresses #4308, but that will have to
    be fixed another way.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/posix_acls.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index b4f8ad5..09165e7 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3221,6 +3221,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.
 ****************************************************************************/
@@ -3413,6 +3416,7 @@ static 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
@@ -3525,6 +3529,9 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 
 	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.
  	 */
@@ -3540,6 +3547,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 			return status;
 		}
 	}
+#endif
 
 	acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
 					&file_ace_list, &dir_ace_list, security_info_sent, psd);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list