diff options
| author | Günther Deschner <gd@samba.org> | 2007-07-11 13:30:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:32 -0500 |
| commit | 9d6f8ed5e7ece2a6bf7a9f51c7dc183932539ff5 (patch) | |
| tree | c9112d80f000b21952de2a9dcdd8aff586cb24f8 | |
| parent | f05dcab9bf3e929f796746420b784525fdf6113e (diff) | |
| download | samba-9d6f8ed5e7ece2a6bf7a9f51c7dc183932539ff5.tar.gz samba-9d6f8ed5e7ece2a6bf7a9f51c7dc183932539ff5.tar.bz2 samba-9d6f8ed5e7ece2a6bf7a9f51c7dc183932539ff5.zip | |
r23837: Pass ADS_STRUCT and TALLOC_CTX down to ads_disp_sd.
Guenther
(This used to be commit ad0a6d5703c35d48ab5bbfa8d6506d42e0cfb61d)
| -rw-r--r-- | source3/libads/disp_sec.c | 12 | ||||
| -rw-r--r-- | source3/libads/ldap.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c index 516f204ed6..9ea332858f 100644 --- a/source3/libads/disp_sec.c +++ b/source3/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/source3/libads/ldap.c b/source3/libads/ldap.c index a1d1a2d649..32cc82c925 100644 --- a/source3/libads/ldap.c +++ b/source3/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); |