diff options
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/disp_sec.c | 4 | ||||
| -rw-r--r-- | source3/libads/ldap.c | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c index e85809635f..e211ef69e4 100644 --- a/source3/libads/disp_sec.c +++ b/source3/libads/disp_sec.c @@ -114,14 +114,14 @@ static void ads_disp_sec_ace_object(ADS_STRUCT *ads, { if (object->flags & SEC_ACE_OBJECT_PRESENT) { printf("Object type: SEC_ACE_OBJECT_PRESENT\n"); - printf("Object GUID: %s (%s)\n", smb_uuid_string_static( + printf("Object GUID: %s (%s)\n", smb_uuid_string(mem_ctx, object->type.type), ads_interprete_guid_from_object(ads, mem_ctx, &object->type.type)); } if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) { printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n"); - printf("Object GUID: %s (%s)\n", smb_uuid_string_static( + printf("Object GUID: %s (%s)\n", smb_uuid_string(mem_ctx, object->inherited_type.inherited_type), ads_interprete_guid_from_object(ads, mem_ctx, &object->inherited_type.inherited_type)); diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 01f6b00c02..533aa3026f 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -1828,11 +1828,14 @@ static void dump_binary(ADS_STRUCT *ads, const char *field, struct berval **valu static void dump_guid(ADS_STRUCT *ads, const char *field, struct berval **values) { int i; - UUID_FLAT guid; for (i=0; values[i]; i++) { + + UUID_FLAT guid; + struct GUID tmp; + memcpy(guid.info, values[i]->bv_val, sizeof(guid.info)); - printf("%s: %s\n", field, - smb_uuid_string_static(smb_uuid_unpack_static(guid))); + smb_uuid_unpack(guid, &tmp); + printf("%s: %s\n", field, smb_uuid_string(talloc_tos(), tmp)); } } @@ -3429,7 +3432,7 @@ const char *ads_get_extended_right_name_by_guid(ADS_STRUCT *ads, } expr = talloc_asprintf(mem_ctx, "(rightsGuid=%s)", - smb_uuid_string_static(*rights_guid)); + smb_uuid_string(mem_ctx, *rights_guid)); if (!expr) { goto done; } |