CVE-2013-6442: s3:smbcacls - ensure we don't lose an existing ACL when setting 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@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(master): Tue Mar 11 22:55:54 CET 2014 on sn-devel-104

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 11b7388303cd7acacf7bb3e9b7d3dc8fa967d925..e3b7099f4fd65270feb9bb7ce9b465d1d4fe9adf 100644 (file)
--- 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);