Author: gd Date: 2007-07-11 13:30:38 +0000 (Wed, 11 Jul 2007) New Revision: 23837
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23837 Log: Pass ADS_STRUCT and TALLOC_CTX down to ads_disp_sd. Guenther Modified: branches/SAMBA_3_2/source/libads/disp_sec.c branches/SAMBA_3_2/source/libads/ldap.c branches/SAMBA_3_2_0/source/libads/disp_sec.c branches/SAMBA_3_2_0/source/libads/ldap.c Changeset: Modified: branches/SAMBA_3_2/source/libads/disp_sec.c =================================================================== --- branches/SAMBA_3_2/source/libads/disp_sec.c 2007-07-11 13:26:04 UTC (rev 23836) +++ branches/SAMBA_3_2/source/libads/disp_sec.c 2007-07-11 13:30:38 UTC (rev 23837) @@ -80,7 +80,7 @@ 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 @@ } /* 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 @@ 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 @@ } /* 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 @@ 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"); } Modified: branches/SAMBA_3_2/source/libads/ldap.c =================================================================== --- branches/SAMBA_3_2/source/libads/ldap.c 2007-07-11 13:26:04 UTC (rev 23836) +++ branches/SAMBA_3_2/source/libads/ldap.c 2007-07-11 13:30:38 UTC (rev 23837) @@ -1837,7 +1837,9 @@ 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); Modified: branches/SAMBA_3_2_0/source/libads/disp_sec.c =================================================================== --- branches/SAMBA_3_2_0/source/libads/disp_sec.c 2007-07-11 13:26:04 UTC (rev 23836) +++ branches/SAMBA_3_2_0/source/libads/disp_sec.c 2007-07-11 13:30:38 UTC (rev 23837) @@ -80,7 +80,7 @@ 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 @@ } /* 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 @@ 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 @@ } /* 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 @@ 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"); } Modified: branches/SAMBA_3_2_0/source/libads/ldap.c =================================================================== --- branches/SAMBA_3_2_0/source/libads/ldap.c 2007-07-11 13:26:04 UTC (rev 23836) +++ branches/SAMBA_3_2_0/source/libads/ldap.c 2007-07-11 13:30:38 UTC (rev 23837) @@ -1837,7 +1837,9 @@ 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);
