r3972: use GUID_* naming context and move GUID_* functions to one place

metze
(This used to be commit 523e6acf4fec5d4946fa7c0c89f40d7d712c9f3a)

4 files changed, 6 insertions, 69 deletions

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 1f790a8ca2..e4275bea49 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -51,7 +51,6 @@ ADD_OBJ_FILES = \
 		lib/wins_srv.o \
 		lib/util_str.o \
 		lib/util_strlist.o \
-		lib/util_uuid.o \
 		lib/util_unistr.o \
 		lib/util_file.o \
 		lib/data_blob.o \
diff --git a/source4/lib/dcom/common/main.c b/source4/lib/dcom/common/main.c
index 3730137268..61fd7d3ff7 100644
--- a/source4/lib/dcom/common/main.c
+++ b/source4/lib/dcom/common/main.c
@@ -162,7 +162,7 @@ static WERROR dcom_create_object_remote(struct dcom_context *ctx, struct GUID *c
 	ZERO_STRUCT(r.in);
 	r.in.this.version.MajorVersion = COM_MAJOR_VERSION;
 	r.in.this.version.MinorVersion = COM_MINOR_VERSION;
-	uuid_generate_random(&r.in.this.cid);
+	r.in.this.cid = GUID_random();
 	r.in.Clsid = *clsid;
 	r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
 	r.in.num_protseqs = ARRAY_SIZE(protseq);
@@ -279,7 +279,7 @@ WERROR dcom_get_class_object_remote(struct dcom_context *ctx, struct GUID *clsid
 	ZERO_STRUCT(r.in);
 	r.in.this.version.MajorVersion = COM_MAJOR_VERSION;
 	r.in.this.version.MinorVersion = COM_MINOR_VERSION;
-	uuid_generate_random(&r.in.this.cid);
+	r.in.this.cid = GUID_random();
 	r.in.Clsid = *clsid;
 	r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
 	r.in.num_protseqs = ARRAY_SIZE(protseq);
@@ -355,7 +355,7 @@ NTSTATUS dcom_get_pipe (struct dcom_interface_p *iface, struct dcerpc_pipe **p)
 	iid = iface->interface->iid;
 
 	if (iface->ox->pipe) {
-		if (!uuid_equal(&iface->ox->pipe->syntax.uuid, &iid)) {
+		if (!GUID_equal(&iface->ox->pipe->syntax.uuid, &iid)) {
 			iface->ox->pipe->syntax.uuid = iid;
 			status = dcerpc_alter(iface->ox->pipe, iface->ctx);
 			if (NT_STATUS_IS_ERR(status)) {
@@ -538,7 +538,7 @@ struct dcom_interface_p *dcom_new_local_ifacep(struct dcom_context *ctx, const s
 	ip->ctx = ctx;
 	ip->interface = iface;
 	ip->vtable = vtable;
-	uuid_generate_random(&ip->ipid);
+	ip->ipid = GUID_random();
 	ip->object = object;
 	ip->objref_flags = 0;
 	ip->orpc_flags = 0;
diff --git a/source4/lib/dcom/common/tables.c b/source4/lib/dcom/common/tables.c
index f615662b47..6b0d99cae3 100644
--- a/source4/lib/dcom/common/tables.c
+++ b/source4/lib/dcom/common/tables.c
@@ -37,7 +37,7 @@ const struct dcom_interface *dcom_interface_by_iid(const struct GUID *iid)
 
 	while(l) {
 		
-		if (uuid_equal(iid, &l->interface.iid)) 
+		if (GUID_equal(iid, &l->interface.iid)) 
 			return &l->interface;
 		
 		l = l->next;
@@ -52,7 +52,7 @@ const struct dcom_class *dcom_class_by_clsid(const struct GUID *clsid)
 
 	while(c) {
 
-		if (uuid_equal(clsid, &c->class.clsid)) {
+		if (GUID_equal(clsid, &c->class.clsid)) {
 			return &c->class;
 		}
 
diff --git a/source4/lib/util_uuid.c b/source4/lib/util_uuid.c
deleted file mode 100644
index a11b7bd3ed..0000000000
--- a/source4/lib/util_uuid.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  UUID server routines
- *  Copyright (C) Theodore Ts'o               1996, 1997,
- *  Copyright (C) Jim McDonough                     2002.
- *  Copyright (C) Andrew Tridgell                   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
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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.
- */
-
-#include "includes.h"
-
-void uuid_generate_random(struct GUID *out)
-{
-	generate_random_buffer((unsigned char *)out, sizeof(struct GUID));
-	out->clock_seq[0] = (out->clock_seq[0] & 0x3F) | 0x80;
-	out->time_hi_and_version = (out->time_hi_and_version & 0x0FFF) | 0x4000;
-}
-
-BOOL uuid_all_zero(const struct GUID *u)
-{
-	if (u->time_low != 0 ||
-	    u->time_mid != 0 ||
-	    u->time_hi_and_version != 0 ||
-	    u->clock_seq[0] != 0 ||
-	    u->clock_seq[1] != 0 ||
-	    !all_zero(u->node, 6)) {
-		return False;
-	}
-	return True;
-}
-
-BOOL uuid_equal(const struct GUID *u1, const struct GUID *u2)
-{
-	if (u1->time_low != u2->time_low ||
-	    u1->time_mid != u2->time_mid ||
-	    u1->time_hi_and_version != u2->time_hi_and_version ||
-	    u1->clock_seq[0] != u2->clock_seq[0] ||
-	    u1->clock_seq[1] != u2->clock_seq[1] ||
-	    memcmp(u1->node, u2->node, 6) != 0) {
-		return False;
-	}
-	return True;
-}
-
-BOOL policy_handle_empty(struct policy_handle *h) 
-{
-	return (h->handle_type == 0 && uuid_all_zero(&h->uuid));
-}
-