From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 Mar 2012 15:54:21 +0000 (+0100)
Subject: libndr: Rename policy_handle_equal to ndr_policy_handle_equal.
X-Git-Tag: tdb-1.2.10~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f92b05b95575d45e91dcd2885fb4e2d202deb9ae;p=thirdparty%2Fsamba.git

libndr: Rename policy_handle_equal to ndr_policy_handle_equal.

This makes the NDR namespace a bit clearer, in preparation of ABI checking.
---

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index dafce6451aa..e68f30369f3 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -557,7 +557,7 @@ enum ndr_err_code ndr_push_policy_handle(struct ndr_push *ndr, int ndr_flags, co
 void ndr_print_policy_handle(struct ndr_print *ndr, const char *name, const struct policy_handle *r);
 bool policy_handle_empty(const struct policy_handle *h);
 bool is_valid_policy_hnd(const struct policy_handle *hnd);
-bool policy_handle_equal(const struct policy_handle *hnd1,
+bool ndr_policy_handle_equal(const struct policy_handle *hnd1,
 			 const struct policy_handle *hnd2);
 
 void ndr_check_padding(struct ndr_pull *ndr, size_t n);
diff --git a/librpc/ndr/uuid.c b/librpc/ndr/uuid.c
index 445b6dda7e4..9ebccfe29a2 100644
--- a/librpc/ndr/uuid.c
+++ b/librpc/ndr/uuid.c
@@ -341,7 +341,7 @@ _PUBLIC_ bool is_valid_policy_hnd(const struct policy_handle *hnd)
 	return !policy_handle_empty(hnd);
 }
 
-_PUBLIC_ bool policy_handle_equal(const struct policy_handle *hnd1,
+_PUBLIC_ bool ndr_policy_handle_equal(const struct policy_handle *hnd1,
 				  const struct policy_handle *hnd2)
 {
 	if (!hnd1 || !hnd2) {
diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index 1c3a94ee9cd..7b3d3c58e76 100644
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -283,7 +283,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_handle_equal(handle, &priv->samr.domain_handle)) {
+	if (!ndr_policy_handle_equal(handle, &priv->samr.domain_handle)) {
 		return;
 	}
 
@@ -311,7 +311,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_handle_equal(handle, &priv->samr.builtin_handle)) {
+	if (!ndr_policy_handle_equal(handle, &priv->samr.builtin_handle)) {
 		return;
 	}
 
@@ -339,7 +339,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_handle_equal(handle, &priv->samr.connect_handle)) {
+	if (!ndr_policy_handle_equal(handle, &priv->samr.connect_handle)) {
 		return;
 	}