From: Volker Lendecke <vl@samba.org>
Date: Sat, 19 Jul 2008 17:50:36 +0000 (+0200)
Subject: Ooops, GUID_equal was already around :-)
X-Git-Tag: samba-3.3.0pre1~468
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a0bc277f23831124d049301bc7009a285d91a11;p=thirdparty%2Fsamba.git

Ooops, GUID_equal was already around :-)
---

diff --git a/source/include/proto.h b/source/include/proto.h
index c204a9419c4..136abca7f3c 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1817,7 +1817,6 @@ void smb_uuid_generate_random(struct GUID *uu);
 const char *smb_uuid_string(TALLOC_CTX *mem_ctx, const struct GUID uu);
 bool smb_string_to_uuid(const char *in, struct GUID* uu);
 char *guid_binstring(const struct GUID *guid);
-bool guid_equal(const struct GUID *g1, const struct GUID *g2);
 
 /* The following definitions come from lib/version.c  */
 
diff --git a/source/lib/util_uuid.c b/source/lib/util_uuid.c
index 0d788ac8b43..3a8f7b3f4f4 100644
--- a/source/lib/util_uuid.c
+++ b/source/lib/util_uuid.c
@@ -129,13 +129,3 @@ char *guid_binstring(const struct GUID *guid)
 
 	return binary_string_rfc2254((char *)guid_flat.info, UUID_FLAT_SIZE);
 }
-
-bool guid_equal(const struct GUID *g1, const struct GUID *g2)
-{
-	return ((g1->time_low == g2->time_low)
-		&& (g1->time_mid == g2->time_mid)
-		&& (g1->time_hi_and_version == g2->time_hi_and_version)
-		&& (memcmp(g1->clock_seq, g2->clock_seq,
-			   sizeof(g1->clock_seq)) == 0)
-		&& (memcmp(g1->node, g2->node, sizeof(g1->node)) == 0));
-}
diff --git a/source/librpc/ndr/ndr_misc.c b/source/librpc/ndr/ndr_misc.c
index f1468166ff9..e86842527c9 100644
--- a/source/librpc/ndr/ndr_misc.c
+++ b/source/librpc/ndr/ndr_misc.c
@@ -46,7 +46,7 @@ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *
 bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1,
 			 const struct ndr_syntax_id *i2)
 {
-	return guid_equal(&i1->uuid, &i2->uuid)
+	return GUID_equal(&i1->uuid, &i2->uuid)
 		&& (i1->if_version == i2->if_version);
 }