summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-12-18 13:56:18 -0800
committerKarolin Seeger <kseeger@samba.org>2014-03-11 22:55:53 +0100
commit41d8d99d8ac9e53405868bf5e34f48a01550c1f4 (patch)
tree35a2f1b23184f264a917fa96e5e14f1ed20432f4 /source3
parent8c01dbc0586d89f974f08a30f7c7a8ed4f7f7813 (diff)
downloadsamba-41d8d99d8ac9e53405868bf5e34f48a01550c1f4.tar.gz
samba-41d8d99d8ac9e53405868bf5e34f48a01550c1f4.tar.xz
samba-41d8d99d8ac9e53405868bf5e34f48a01550c1f4.zip
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@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
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/smbcacls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 11b7388303..e3b7099f4f 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);