s3: Remove some pointless uses of string_sid_talloc

[ira/wip.git] / source3 / lib / util_uuid.c

diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index 8217006e58f230754b835a4d27de7844399aec85..656ba2a57cb16bbed501ac949ddd145ea38945e9 100644 (file)
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -2,11 +2,11 @@
  *  Unix SMB/CIFS implementation.
  *  UUID server routines
  *  Copyright (C) Theodore Ts'o               1996, 1997,
- *  Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002.
+ *  Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002, 2003
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
@@ -15,28 +15,21 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
 
-/*
- * Offset between 15-Oct-1582 and 1-Jan-70
- */
-#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 GUID 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->info, 0, uu.time_low);
+       SSVAL(ptr->info, 4, uu.time_mid);
+       SSVAL(ptr->info, 6, uu.time_hi_and_version);
+       memcpy(ptr->info+8, uu.clock_seq, 2);
+       memcpy(ptr->info+10, uu.node, 6);
 }
 
-void smb_uuid_unpack(const UUID_FLAT in, struct uuid *uu)
+void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu)
 {
        uu->time_low = IVAL(in.info, 0);
        uu->time_mid = SVAL(in.info, 4);
@@ -45,47 +38,16 @@ void smb_uuid_unpack(const UUID_FLAT in, struct uuid *uu)
        memcpy(uu->node, in.info+10, 6);
 }
 
-const struct uuid smb_uuid_unpack_static(const UUID_FLAT in)
-{
-       static struct uuid uu;
-
-       smb_uuid_unpack(in, &uu);
-       return uu;
-}
-
-void smb_uuid_generate_random(struct uuid *uu)
-{
-       UUID_FLAT tmp;
-
-       generate_random_buffer(tmp.info, sizeof(tmp.info), True);
-       smb_uuid_unpack(tmp, uu);
-
-       uu->clock_seq[0] = (uu->clock_seq[0] & 0x3F) | 0x80;
-       uu->time_hi_and_version = (uu->time_hi_and_version & 0x0FFF) | 0x4000;
-}
+/*****************************************************************
+ Return the binary string representation of a GUID.
+ Caller must free.
+*****************************************************************/
 
-char *smb_uuid_to_string(const struct uuid uu)
+char *guid_binstring(TALLOC_CTX *mem_ctx, const struct GUID *guid)
 {
-       char *out;
-
-       asprintf(&out, "%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]);
+       UUID_FLAT guid_flat;
 
-       return out;
-}
-
-const char *smb_uuid_string_static(const struct uuid uu)
-{
-       static char out[37];
+       smb_uuid_pack(*guid, &guid_flat);
 
-       slprintf(out, sizeof(out), 
-                "%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]);
-       return out;
+       return binary_string_rfc2254(mem_ctx, guid_flat.info, UUID_FLAT_SIZE);
 }