[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3339-g3ab3f26

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  3ab3f2610500107c9cff677746365bba143ca9de (commit)
       via  9a0bc277f23831124d049301bc7009a285d91a11 (commit)
      from  b46ce28039e8829f5188574ebe84ff3b7d9e65bc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 3ab3f2610500107c9cff677746365bba143ca9de
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jul 19 19:53:01 2008 +0200

    Make use of ndr_syntax_id_equal

commit 9a0bc277f23831124d049301bc7009a285d91a11
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jul 19 19:50:36 2008 +0200

    Ooops, GUID_equal was already around :-)

-----------------------------------------------------------------------

Summary of changes:
 source/include/proto.h       |    1 -
 source/lib/util_uuid.c       |   10 ----------
 source/librpc/ndr/ndr_misc.c |    2 +-
 source/rpc_parse/parse_rpc.c |    4 ++--
 4 files changed, 3 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index c204a94..136abca 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 0d788ac..3a8f7b3 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 f146816..e868425 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);
 }
 
diff --git a/source/rpc_parse/parse_rpc.c b/source/rpc_parse/parse_rpc.c
index fbdc3ed..ac5483d 100644
--- a/source/rpc_parse/parse_rpc.c
+++ b/source/rpc_parse/parse_rpc.c
@@ -80,9 +80,9 @@ int cli_get_pipe_idx(const RPC_IFACE *syntax)
 {
 	int i;
 	for (i = 0; pipe_names[i].client_pipe; i++) {
-		if (GUID_equal(&pipe_names[i].abstr_syntax->uuid, &syntax->uuid) &&
-		    pipe_names[i].abstr_syntax->if_version == syntax->if_version)
+		if (ndr_syntax_id_equal(pipe_names[i].abstr_syntax, syntax)) {
 			return i;
+		}
 	}
 
 	return -1;


-- 
Samba Shared Repository