libndr: share some uuid helpers.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Feb  8 09:52:56 CET 2011 on sn-devel-104

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 314df359071ddb87accbfced142a218f72332cdc..f62153596d8d6df95fa9dee6073a1944adf5fab6 100644 (file)
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -506,6 +506,9 @@ enum ndr_err_code ndr_pull_policy_handle(struct ndr_pull *ndr, int ndr_flags, st
 enum ndr_err_code ndr_push_policy_handle(struct ndr_push *ndr, int ndr_flags, const struct policy_handle *r);
 void ndr_print_policy_handle(struct ndr_print *ndr, const char *name, const struct policy_handle *r);
 bool policy_handle_empty(struct policy_handle *h);
+bool is_valid_policy_hnd(const struct policy_handle *hnd);
+bool policy_handle_equal(const struct policy_handle *hnd1,
+                        const struct policy_handle *hnd2);
 
 void ndr_check_padding(struct ndr_pull *ndr, size_t n);
 enum ndr_err_code ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v);

diff --git a/librpc/ndr/uuid.c b/librpc/ndr/uuid.c
index 33a7eeeb5a77cae1b69aaa2c1f7fcd1d92fd1902..b6a7fc7071a50300e4a7f6e7a95b8efcff3758db 100644 (file)
--- a/librpc/ndr/uuid.c
+++ b/librpc/ndr/uuid.c
@@ -335,3 +335,20 @@ _PUBLIC_ bool policy_handle_empty(struct policy_handle *h)
 {
        return (h->handle_type == 0 && GUID_all_zero(&h->uuid));
 }
+
+_PUBLIC_ bool is_valid_policy_hnd(const struct policy_handle *hnd)
+{
+       struct policy_handle tmp;
+       ZERO_STRUCT(tmp);
+       return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
+}
+
+_PUBLIC_ bool policy_handle_equal(const struct policy_handle *hnd1,
+                                 const struct policy_handle *hnd2)
+{
+       if (!hnd1 || !hnd2) {
+               return false;
+       }
+
+       return (memcmp(hnd1, hnd2, sizeof(*hnd1)) == 0);
+}

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 01c450c07582627ec8e1b861d3737256dc4e980a..a50917762f7f2fe379d1bee3cc1fdb8bd67e0980 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1186,9 +1186,6 @@ void *_talloc_memdup_zeronull(const void *t, const void *p, size_t size, const c
 void *_talloc_array_zeronull(const void *ctx, size_t el_size, unsigned count, const char *name);
 void *_talloc_zero_array_zeronull(const void *ctx, size_t el_size, unsigned count, const char *name);
 void *talloc_zeronull(const void *context, size_t size, const char *name);
-bool is_valid_policy_hnd(const struct policy_handle *hnd);
-bool policy_hnd_equal(const struct policy_handle *hnd1,
-                     const struct policy_handle *hnd2);
 const char *strip_hostname(const char *s);
 bool tevent_req_poll_ntstatus(struct tevent_req *req,
                              struct tevent_context *ev,

diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index 470e5e613c412a57e567ee0774073a0e9a8bd413..f859c529f12e9300cd2eae1afb7ba87544ab9f92 100644 (file)
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -270,7 +270,7 @@ void libnetapi_samr_close_domain_handle(struct libnetapi_ctx *ctx,
        priv = talloc_get_type_abort(ctx->private_data,
                struct libnetapi_private_ctx);
 
-       if (!policy_hnd_equal(handle, &priv->samr.domain_handle)) {
+       if (!policy_handle_equal(handle, &priv->samr.domain_handle)) {
                return;
        }
 
@@ -298,7 +298,7 @@ void libnetapi_samr_close_builtin_handle(struct libnetapi_ctx *ctx,
        priv = talloc_get_type_abort(ctx->private_data,
                struct libnetapi_private_ctx);
 
-       if (!policy_hnd_equal(handle, &priv->samr.builtin_handle)) {
+       if (!policy_handle_equal(handle, &priv->samr.builtin_handle)) {
                return;
        }
 
@@ -326,7 +326,7 @@ void libnetapi_samr_close_connect_handle(struct libnetapi_ctx *ctx,
        priv = talloc_get_type_abort(ctx->private_data,
                struct libnetapi_private_ctx);
 
-       if (!policy_hnd_equal(handle, &priv->samr.connect_handle)) {
+       if (!policy_handle_equal(handle, &priv->samr.connect_handle)) {
                return;
        }
 

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 4baeda4d0aaf2eae42d9cb7f35658ced791ba4d5..08a24ec7222d1f5471dfdf99e3e530d56fb08f5a 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2918,23 +2918,6 @@ void *talloc_zeronull(const void *context, size_t size, const char *name)
 }
 #endif
 
-bool is_valid_policy_hnd(const struct policy_handle *hnd)
-{
-       struct policy_handle tmp;
-       ZERO_STRUCT(tmp);
-       return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
-}
-
-bool policy_hnd_equal(const struct policy_handle *hnd1,
-                     const struct policy_handle *hnd2)
-{
-       if (!hnd1 || !hnd2) {
-               return false;
-       }
-
-       return (memcmp(hnd1, hnd2, sizeof(*hnd1)) == 0);
-}
-
 /****************************************************************
  strip off leading '\\' from a hostname
 ****************************************************************/

diff --git a/source4/torture/rpc/spoolss_access.c b/source4/torture/rpc/spoolss_access.c
index c32c5c108ecb8426f4cf1dad0867d4c493539f41..a935cbd3c3445b071f002d84815da44e93502e9d 100644 (file)
--- a/source4/torture/rpc/spoolss_access.c
+++ b/source4/torture/rpc/spoolss_access.c
@@ -100,13 +100,6 @@ static bool test_openprinter_handle(struct torture_context *tctx,
        return true;
 }
 
-static bool is_valid_policy_hnd(const struct policy_handle *hnd)
-{
-       struct policy_handle tmp;
-       ZERO_STRUCT(tmp);
-       return (memcmp(&tmp, hnd, sizeof(tmp)) != 0);
-}
-
 static bool test_openprinter_access(struct torture_context *tctx,
                                    struct dcerpc_pipe *p,
                                    const char *name,