From: Günther Deschner <gd@samba.org>
Date: Wed, 11 Jul 2007 13:30:38 +0000 (+0000)
Subject: r23837: Pass ADS_STRUCT and TALLOC_CTX down to ads_disp_sd.
X-Git-Tag: samba-misc-tags/initial-v3-2-unstable~744
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad0a6d5703c35d48ab5bbfa8d6506d42e0cfb61d;p=thirdparty%2Fsamba.git

r23837: Pass ADS_STRUCT and TALLOC_CTX down to ads_disp_sd.

Guenther
---

diff --git a/source/libads/disp_sec.c b/source/libads/disp_sec.c
index 516f204ed6a..9ea332858fb 100644
--- a/source/libads/disp_sec.c
+++ b/source/libads/disp_sec.c
@@ -80,7 +80,7 @@ static void ads_disp_perms(uint32 type)
 	puts("");
 }
 
-static void ads_disp_sec_ace_object(struct security_ace_object *object)
+static void ads_disp_sec_ace_object(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_ace_object *object)
 {
 	if (object->flags & SEC_ACE_OBJECT_PRESENT) {
 		printf("Object type: SEC_ACE_OBJECT_PRESENT\n");
@@ -95,7 +95,7 @@ static void ads_disp_sec_ace_object(struct security_ace_object *object)
 }
 
 /* display ACE */
-static void ads_disp_ace(SEC_ACE *sec_ace)
+static void ads_disp_ace(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, SEC_ACE *sec_ace)
 {
 	const char *access_type = "UNKNOWN";
 
@@ -132,7 +132,7 @@ static void ads_disp_ace(SEC_ACE *sec_ace)
                sid_string_static(&sec_ace->trustee), access_type);
 
 	if (sec_ace_object(sec_ace->type)) {
-		ads_disp_sec_ace_object(&sec_ace->object.object);
+		ads_disp_sec_ace_object(ads, mem_ctx, &sec_ace->object.object);
 	}
 
 	ads_disp_perms(sec_ace->access_mask);
@@ -153,7 +153,7 @@ static void ads_disp_acl(SEC_ACL *sec_acl, const char *type)
 }
 
 /* display SD */
-void ads_disp_sd(SEC_DESC *sd)
+void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, SEC_DESC *sd)
 {
 	int i;
 	
@@ -165,11 +165,11 @@ void ads_disp_sd(SEC_DESC *sd)
 
 	ads_disp_acl(sd->sacl, "system");
 	for (i = 0; i < sd->sacl->num_aces; i ++)
-		ads_disp_ace(&sd->sacl->aces[i]);
+		ads_disp_ace(ads, mem_ctx, &sd->sacl->aces[i]);
 	
 	ads_disp_acl(sd->dacl, "user");
 	for (i = 0; i < sd->dacl->num_aces; i ++)
-		ads_disp_ace(&sd->dacl->aces[i]);
+		ads_disp_ace(ads, mem_ctx, &sd->dacl->aces[i]);
 
 	printf("-------------- End Of Security Descriptor\n");
 }
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index a1d1a2d649b..32cc82c9252 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -1837,7 +1837,9 @@ static void dump_sd(ADS_STRUCT *ads, const char *filed, struct berval **values)
 		talloc_destroy(ctx);
 		return;
 	}
-	if (psd) ads_disp_sd(psd);
+	if (psd) {
+		ads_disp_sd(ads, ctx, psd);
+	}
 
 	prs_mem_free(&ps);
 	talloc_destroy(ctx);