[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Fri Oct 6 22:05:02 UTC 2017


The branch, master has been updated
       via  a826394 smbcacls: no need to fetch the sd when changing ownership
      from  fc03049 s3: spoolss: Fix GUID string format on GetPrinter info

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


- Log -----------------------------------------------------------------
commit a826394a2f556fe9bc50e430e86f01443e58ee2f
Author: Ralph Boehme <slow at samba.org>
Date:   Fri Oct 6 08:01:46 2017 +0200

    smbcacls: no need to fetch the sd when changing ownership
    
    Reading the SD may be denied but changing ownership could be allowed. As
    we don't really need the server SD for the change ownership request,
    don't fetch it.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Oct  7 00:04:54 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/utils/smbcacls.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index c42a188..0a5eeb3 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -397,21 +397,17 @@ static int owner_set(struct cli_state *cli, enum chown_mode change_mode,
 			const char *filename, const char *new_username)
 {
 	struct dom_sid sid;
-	struct security_descriptor *sd, *old;
+	struct security_descriptor *sd;
 	size_t sd_size;
 
 	if (!StringToSid(cli, &sid, new_username))
 		return EXIT_PARSE_ERROR;
 
-	old = get_secdesc(cli, filename);
-
-	if (!old) {
-		return EXIT_FAILED;
-	}
-
-	sd = make_sec_desc(talloc_tos(),old->revision, SEC_DESC_SELF_RELATIVE,
-				(change_mode == REQUEST_CHOWN) ? &sid : NULL,
-				(change_mode == REQUEST_CHGRP) ? &sid : NULL,
+	sd = make_sec_desc(talloc_tos(),
+			   SECURITY_DESCRIPTOR_REVISION_1,
+			   SEC_DESC_SELF_RELATIVE,
+			   (change_mode == REQUEST_CHOWN) ? &sid : NULL,
+			   (change_mode == REQUEST_CHGRP) ? &sid : NULL,
 			   NULL, NULL, &sd_size);
 
 	if (!set_secdesc(cli, filename, sd)) {


-- 
Samba Shared Repository



More information about the samba-cvs mailing list