[SCM] Samba Shared Repository - branch master updated

[Anatoliy Atanasov]

The branch, master has been updated
       via  3bae05d... s4: check the sacl and dacl pointers on the old sd
      from  da894b7... s3-waf: Fix the build

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3bae05d286b54ccb8c4d624c7f305bd84138c454
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Tue Jun 1 15:05:02 2010 +0300

    s4: check the sacl and dacl pointers on the old sd

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/descriptor.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 6c9baaa..cfab5a0 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -176,7 +176,7 @@ static struct security_descriptor *descr_handle_sd_flags(TALLOC_CTX *mem_ctx,
 			SEC_DESC_SACL_AUTO_INHERITED|SEC_DESC_SACL_PROTECTED |
 			SEC_DESC_SERVER_SECURITY);
 	} 
-	else if (old_sd) {
+	else if (old_sd && old_sd->sacl) {
 		final_sd->sacl = security_acl_dup(mem_ctx,old_sd->sacl);
 		final_sd->type |= old_sd->type & (SEC_DESC_SACL_PRESENT |
 			SEC_DESC_SACL_DEFAULTED|SEC_DESC_SACL_AUTO_INHERIT_REQ |
@@ -191,7 +191,7 @@ static struct security_descriptor *descr_handle_sd_flags(TALLOC_CTX *mem_ctx,
 			SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_PROTECTED |
 			SEC_DESC_DACL_TRUSTED);
 	} 
-	else if (old_sd) {
+	else if (old_sd && old_sd->dacl) {
 		final_sd->dacl = security_acl_dup(mem_ctx,old_sd->dacl);
 		final_sd->type |= old_sd->type & (SEC_DESC_DACL_PRESENT |
 			SEC_DESC_DACL_DEFAULTED|SEC_DESC_DACL_AUTO_INHERIT_REQ |


-- 
Samba Shared Repository