summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2007-07-09 22:15:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:21 -0500
commitf622dc8d2f4b27db433aa443ef503e80c67f2fc9 (patch)
tree871ec258ff0ccf64bcb5bd5db08de44a82d97a73
parent2a9b4da0fa00d4ada504f49fafcadab7b0094331 (diff)
downloadsamba-f622dc8d2f4b27db433aa443ef503e80c67f2fc9.tar.gz
samba-f622dc8d2f4b27db433aa443ef503e80c67f2fc9.tar.bz2
samba-f622dc8d2f4b27db433aa443ef503e80c67f2fc9.zip
r23782: I tested this against NT4 PDC, W2K Server, W2K3 Dc, and a Win XP std alone
client and they all work with this code. (This used to be commit 44e22581d731572d3fa260b92063922c59ce75db)
-rw-r--r--source3/utils/smbcacls.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index e4ab4e9283..3bcf9885bc 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -730,7 +730,7 @@ static int cacl_set(struct cli_state *cli, char *filename,
sort_acl(old->dacl);
/* Create new security descriptor and set it */
-#if 0
+
/* We used to just have "WRITE_DAC_ACCESS" without WRITE_OWNER.
But if we're sending an owner, even if it's the same as the one
that already exists then W2K3 insists we open with WRITE_OWNER access.
@@ -742,12 +742,7 @@ static int cacl_set(struct cli_state *cli, char *filename,
NULL, old->dacl, &sd_size);
fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS);
-#else
- sd = make_sec_desc(ctx,old->revision, old->type, NULL, NULL,
- NULL, old->dacl, &sd_size);
- fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS);
-#endif
if (fnum == -1) {
printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
return EXIT_FAILED;