diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 02:26:18 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 02:26:18 +0200 |
| commit | 1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e (patch) | |
| tree | dc2074d60a5f0cf1eca3236e02a95782613b1533 /source3/lib | |
| parent | 7e5bbe806958ea8176e4c8494e3b3f79570635da (diff) | |
| download | samba-1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e.tar.gz samba-1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e.tar.bz2 samba-1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e.zip | |
Use GUID_string rather than smb_uuid_string().
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/display_sec.c | 8 | ||||
| -rw-r--r-- | source3/lib/util_uuid.c | 16 |
2 files changed, 4 insertions, 20 deletions
diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c index 5427a8173e..a0d93d6fe7 100644 --- a/source3/lib/display_sec.c +++ b/source3/lib/display_sec.c @@ -157,13 +157,13 @@ static void disp_sec_ace_object(struct security_ace_object *object) { if (object->flags & SEC_ACE_OBJECT_PRESENT) { printf("Object type: SEC_ACE_OBJECT_PRESENT\n"); - printf("Object GUID: %s\n", smb_uuid_string(talloc_tos(), - object->type.type)); + printf("Object GUID: %s\n", GUID_string(talloc_tos(), + &object->type.type)); } if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) { printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n"); - printf("Object GUID: %s\n", smb_uuid_string(talloc_tos(), - object->inherited_type.inherited_type)); + printf("Object GUID: %s\n", GUID_string(talloc_tos(), + &object->inherited_type.inherited_type)); } } diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c index 3a8f7b3f4f..5d9a56cd23 100644 --- a/source3/lib/util_uuid.c +++ b/source3/lib/util_uuid.c @@ -55,22 +55,6 @@ void smb_uuid_generate_random(struct GUID *uu) uu->time_hi_and_version = (uu->time_hi_and_version & 0x0FFF) | 0x4000; } -const char *smb_uuid_string(TALLOC_CTX *mem_ctx, const struct GUID uu) -{ - char *result; - - result = talloc_asprintf( - mem_ctx, - "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - uu.time_low, uu.time_mid, uu.time_hi_and_version, - uu.clock_seq[0], uu.clock_seq[1], - uu.node[0], uu.node[1], uu.node[2], - uu.node[3], uu.node[4], uu.node[5]); - - SMB_ASSERT(result != NULL); - return result; -} - bool smb_string_to_uuid(const char *in, struct GUID* uu) { bool ret = False; |