diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/lib/netapi/samr.c | 6 | ||||
| -rw-r--r-- | source3/lib/util.c | 17 |
3 files changed, 3 insertions, 23 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 01c450c075..a50917762f 100644 --- 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 470e5e613c..f859c529f1 100644 --- 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 4baeda4d0a..08a24ec722 100644 --- 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 ****************************************************************/ |