From b4d35bee38a4cfd0eba26956dde2c5bb23cdb1c3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 Mar 2012 17:44:24 +0100 Subject: libndr: Rename policy_handle_empty to ndr_policy_handle_empty. This makes the NDR namespace a bit clearer, in preparation of ABI checking. --- source4/libnet/libnet_domain.c | 2 +- source4/libnet/prereq_domain.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/libnet') diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c index b2a88827bd..d2b96958ee 100644 --- a/source4/libnet/libnet_domain.c +++ b/source4/libnet/libnet_domain.c @@ -308,7 +308,7 @@ struct composite_context *libnet_DomainOpenSamr_send(struct libnet_context *ctx, /* libnet context's domain handle is not empty, so check out what was opened first, before doing anything */ - if (!policy_handle_empty(&ctx->samr.handle)) { + if (!ndr_policy_handle_empty(&ctx->samr.handle)) { if (strequal(ctx->samr.name, io->in.domain_name) && ctx->samr.access_mask == io->in.access_mask) { diff --git a/source4/libnet/prereq_domain.c b/source4/libnet/prereq_domain.c index e10e550585..039d99d9ef 100644 --- a/source4/libnet/prereq_domain.c +++ b/source4/libnet/prereq_domain.c @@ -45,7 +45,7 @@ bool samr_domain_opened(struct libnet_context *ctx, const char *domain_name, * if it's not been explicitly specified. */ - if (policy_handle_empty(&ctx->samr.handle)) { + if (ndr_policy_handle_empty(&ctx->samr.handle)) { domain_open->in.type = DOMAIN_SAMR; domain_open->in.domain_name = cli_credentials_get_domain(ctx->cred); domain_open->in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; @@ -62,7 +62,7 @@ bool samr_domain_opened(struct libnet_context *ctx, const char *domain_name, * opening a new domain otherwise. */ - if (policy_handle_empty(&ctx->samr.handle) || + if (ndr_policy_handle_empty(&ctx->samr.handle) || !strequal(domain_name, ctx->samr.name)) { domain_open->in.type = DOMAIN_SAMR; domain_open->in.domain_name = domain_name; @@ -100,7 +100,7 @@ bool lsa_domain_opened(struct libnet_context *ctx, const char *domain_name, * if it's not been explicitly specified. */ - if (policy_handle_empty(&ctx->lsa.handle)) { + if (ndr_policy_handle_empty(&ctx->lsa.handle)) { domain_open->in.type = DOMAIN_LSA; domain_open->in.domain_name = cli_credentials_get_domain(ctx->cred); domain_open->in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; @@ -119,7 +119,7 @@ bool lsa_domain_opened(struct libnet_context *ctx, const char *domain_name, * opening a new domain otherwise. */ - if (policy_handle_empty(&ctx->lsa.handle) || + if (ndr_policy_handle_empty(&ctx->lsa.handle) || !strequal(domain_name, ctx->lsa.name)) { domain_open->in.type = DOMAIN_LSA; domain_open->in.domain_name = domain_name; -- cgit