[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-15-g78941c1

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  78941c166debc8315516d895b2ef77e52417f067 (commit)
      from  2f509fdbed5b0ab3d9ff06bc8101d9851989be19 (commit)

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


- Log -----------------------------------------------------------------
commit 78941c166debc8315516d895b2ef77e52417f067
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 10 16:23:54 2008 -0700

    Fix bug #5052 - not work cancel inheritance on share. We were
    using the parent security descriptor type and flags instead
    of using the passed in SD.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 9913d5a..2fb8f9f 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3300,10 +3300,17 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
 
 	}
 
-	parent_sd->dacl->aces = new_ace;
-	parent_sd->dacl->num_aces = i;
+	/* This sucks. psd should be const and we should
+	 * be doing a deep-copy here. We're getting away
+	 * with is as we know parent_sd is talloced off
+	 * talloc_tos() as well as psd. JRA. */
 
-	*pp_new_sd = parent_sd;
+	psd->dacl->aces = new_ace;
+	psd->dacl->num_aces = i;
+	psd->type &= ~(SE_DESC_DACL_AUTO_INHERITED|
+                         SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+	*pp_new_sd = psd;
 	return status;
 }
 


-- 
Samba Shared Repository