[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  41d8d99 CVE-2013-6442: s3:smbcacls - ensure we don't lose an existing ACL when setting owner or group owner.
      from  8c01dbc gencache: Add gencache values to memcache

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


- Log -----------------------------------------------------------------
commit 41d8d99d8ac9e53405868bf5e34f48a01550c1f4
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 18 13:56:18 2013 -0800

    CVE-2013-6442: s3:smbcacls - ensure we don't lose an existing ACL when setting owner or group owner.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10327
    Bug 10327 - CVE-2013-6442: smbcacls --chown | --chgrp dacl regression
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(master): Tue Mar 11 22:55:54 CET 2014 on sn-devel-104

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

Summary of changes:
 source3/utils/smbcacls.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 11b7388..e3b7099 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -990,7 +990,7 @@ static int owner_set(struct cli_state *cli, enum chown_mode change_mode,
 		return EXIT_FAILED;
 	}
 
-	sd = make_sec_desc(talloc_tos(),old->revision, old->type,
+	sd = make_sec_desc(talloc_tos(),old->revision, SEC_DESC_SELF_RELATIVE,
 				(change_mode == REQUEST_CHOWN) ? &sid : NULL,
 				(change_mode == REQUEST_CHGRP) ? &sid : NULL,
 			   NULL, NULL, &sd_size);


-- 
Samba Shared Repository