Author: idra Date: 2007-07-09 22:15:22 +0000 (Mon, 09 Jul 2007) New Revision: 23782
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23782 Log: I tested this against NT4 PDC, W2K Server, W2K3 Dc, and a Win XP std alone client and they all work with this code. Modified: branches/SAMBA_3_2/source/utils/smbcacls.c branches/SAMBA_3_2_0/source/utils/smbcacls.c Changeset: Modified: branches/SAMBA_3_2/source/utils/smbcacls.c =================================================================== --- branches/SAMBA_3_2/source/utils/smbcacls.c 2007-07-09 21:48:33 UTC (rev 23781) +++ branches/SAMBA_3_2/source/utils/smbcacls.c 2007-07-09 22:15:22 UTC (rev 23782) @@ -730,7 +730,7 @@ 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 @@ 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; Modified: branches/SAMBA_3_2_0/source/utils/smbcacls.c =================================================================== --- branches/SAMBA_3_2_0/source/utils/smbcacls.c 2007-07-09 21:48:33 UTC (rev 23781) +++ branches/SAMBA_3_2_0/source/utils/smbcacls.c 2007-07-09 22:15:22 UTC (rev 23782) @@ -730,7 +730,7 @@ 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 @@ 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;
