Attachment 2193 Details for Bug 3713 – slightly lighter version of your patch

[patch] slightly lighter version of your patch

samba3-profiles.diff (text/plain), 2.07 KB, created by Guenther Deschner on 2006-10-26 15:41:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2006-10-26 15:41:08 UTC

Size: 2.07 KB

patch

obsolete

>Index: utils/profiles.c
>===================================================================
>--- utils/profiles.c	(revision 19499)
>+++ utils/profiles.c	(working copy)
>@@ -34,24 +34,50 @@
> 
> static BOOL swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 )
> {
>-	SEC_ACL *acl = sd->dacl;
>+	SEC_ACL *acl;
> 	int i;
> 	BOOL update = False;
> 
>+	fprintf(stdout, "  Owner SID: %s\n", sid_string_static(sd->owner_sid));
> 	if ( sid_equal( sd->owner_sid, s1 ) ) {
> 		sid_copy( sd->owner_sid, s2 );
> 		update = True;
>+		fprintf(stdout, "  New Owner SID: %s\n", 
>+			sid_string_static(sd->owner_sid));
>+
> 	}
> 
>+	fprintf(stdout, "  Group SID: %s\n", sid_string_static(sd->group_sid));
> 	if ( sid_equal( sd->group_sid, s1 ) ) {
> 		sid_copy( sd->group_sid, s2 );
> 		update = True;
>+		fprintf(stdout, "  New Group SID: %s\n", 
>+			sid_string_static(sd->group_sid));
> 	}
> 
>+	acl = sd->sacl;
>+	fprintf(stdout, "  SACL: %d entries:\n", acl->num_aces);
> 	for ( i=0; i<acl->num_aces; i++ ) {
>+		fprintf(stdout, "    Trustee SID: %s\n", 
>+			sid_string_static(&acl->aces[i].trustee));
> 		if ( sid_equal( &acl->aces[i].trustee, s1 ) ) {
> 			sid_copy( &acl->aces[i].trustee, s2 );
> 			update = True;
>+			fprintf(stdout, "    New Trustee SID: %s\n", 
>+				sid_string_static(&acl->aces[i].trustee));
>+		}
>+	}
>+
>+	acl = sd->dacl;
>+	fprintf(stdout, "  DACL: %d entries: \n", acl->num_aces);
>+	for ( i=0; i<acl->num_aces; i++ ) {
>+		fprintf(stdout, "    Trustee SID: %s\n", 
>+			sid_string_static(&acl->aces[i].trustee));
>+		if ( sid_equal( &acl->aces[i].trustee, s1 ) ) {
>+			sid_copy( &acl->aces[i].trustee, s2 );
>+			update = True;
>+			fprintf(stdout, "    New Trustee SID: %s\n", 
>+				sid_string_static(&acl->aces[i].trustee));
> 		}
> 	}
> 
>@@ -79,8 +105,9 @@
> 		return False;
> 	}
> 
>-	if ( swap_sid_in_acl( new_sd, &old_sid, &new_sid ) )
>-		DEBUG(2,("Updating ACL for %s\n", nk->keyname ));
>+
>+	fprintf(stdout, "ACL for %s%s%s\n", parentpath, parent ? "\\" : "", nk->keyname);
>+	swap_sid_in_acl( new_sd, &old_sid, &new_sid );
> 
> 	if ( !(subkeys = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR )) ) {
> 		DEBUG(0,("copy_registry_tree: talloc() failure!\n"));

Actions: View

Attachments on bug 3713: 1871 | 2193 | 2225