From bff3e7feee2c9ef91a487df410327666c38602c1 Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 30 Oct 2003 17:50:56 +0000 Subject: [PATCH] Nearing the end of the GUID -> struct uuid changes. (This used to be commit 0e8fcfac702515f8870c979262bf881d1155efdc) --- source3/lib/util_uuid.c | 12 ++++++------ source3/nmbd/nmbd_processlogon.c | 9 ++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c index 8217006e58f..fe8595c8cbe 100644 --- a/source3/lib/util_uuid.c +++ b/source3/lib/util_uuid.c @@ -27,13 +27,13 @@ #define TIME_OFFSET_HIGH 0x01B21DD2 #define TIME_OFFSET_LOW 0x13814000 -void smb_uuid_pack(const struct uuid *uu, UUID_FLAT *ptr) +void smb_uuid_pack(const struct uuid uu, UUID_FLAT *ptr) { - SIVAL(ptr, 0, uu->time_low); - SSVAL(ptr, 4, uu->time_mid); - SSVAL(ptr, 6, uu->time_hi_and_version); - memcpy(ptr+8, uu->clock_seq, 2); - memcpy(ptr+10, uu->node, 6); + SIVAL(ptr, 0, uu.time_low); + SSVAL(ptr, 4, uu.time_mid); + SSVAL(ptr, 6, uu.time_hi_and_version); + memcpy(ptr+8, uu.clock_seq, 2); + memcpy(ptr+10, uu.node, 6); } void smb_uuid_unpack(const UUID_FLAT in, struct uuid *uu) diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index 816b3514644..fc66e0d6b49 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -313,7 +313,8 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", } #ifdef HAVE_ADS else { - GUID domain_guid; + struct uuid domain_guid; + UUID_FLAT flat_guid; pstring domain; pstring hostname; char *component, *dc, *q1; @@ -340,8 +341,10 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", DEBUG(2, ("Could not fetch DomainGUID for %s\n", domain)); return; } - memcpy(q, &domain_guid, sizeof(domain_guid)); - q += sizeof(domain_guid); + + smb_uuid_pack(domain_guid, &flat_guid); + memcpy(q, &flat_guid.info, UUID_FLAT_SIZE); + q += UUID_FLAT_SIZE; /* Forest */ str_offset = q - q_orig; -- 2.11.4.GIT