[SCM] Samba Shared Repository - branch master updated - a0e5f9194a8214e6bc7f7e56b82575300401ffef

[Jelmer Vernooij]

The branch, master has been updated
       via  a0e5f9194a8214e6bc7f7e56b82575300401ffef (commit)
      from  a45782a4cbba2b92c04d3ac9dba85db8c692145e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a0e5f9194a8214e6bc7f7e56b82575300401ffef
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date:   Thu Sep 18 16:56:11 2008 +0200

    Import ndr_syntax_id_equal from Samba 3.

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

Summary of changes:
 source4/librpc/ndr/libndr.h   |    1 +
 source4/librpc/ndr/ndr_misc.c |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index b719be2..3f4de78 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -342,6 +342,7 @@ void ndr_print_dom_sid0(struct ndr_print *ndr, const char 
*name, const struct do
 size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
 void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct 
in_addr *_ip);
 void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID 
*guid);
+bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1, const struct 
ndr_syntax_id *i2); 
 enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
struct smb_iconv_convenience *iconv_convenience, const void *p, 
ndr_push_flags_fn_t fn);
 enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
struct smb_iconv_convenience *iconv_convenience, void *p, uint32_t level, 
ndr_push_flags_fn_t fn);
 size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t push);
diff --git a/source4/librpc/ndr/ndr_misc.c b/source4/librpc/ndr/ndr_misc.c
index be7dab9..2e5ecba 100644
--- a/source4/librpc/ndr/ndr_misc.c
+++ b/source4/librpc/ndr/ndr_misc.c
@@ -38,3 +38,9 @@ _PUBLIC_ void ndr_print_GUID(struct ndr_print *ndr, const 
char *name, const stru
        ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, 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)
+               && (i1->if_version == i2->if_version);
+}


-- 
Samba Shared Repository