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 ++++---- source4/rpc_server/handles.c | 2 +- source4/torture/rpc/epmapper.c | 10 +++++----- source4/torture/rpc/samr.c | 13 +++++++------ 5 files changed, 18 insertions(+), 17 deletions(-) (limited to 'source4') 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; diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c index e70510c875..be9f16ce73 100644 --- a/source4/rpc_server/handles.c +++ b/source4/rpc_server/handles.c @@ -82,7 +82,7 @@ _PUBLIC_ struct dcesrv_handle *dcesrv_handle_fetch( sid = &context->conn->auth_state.session_info->security_token->sids[PRIMARY_USER_SID_INDEX]; - if (policy_handle_empty(p)) { + if (ndr_policy_handle_empty(p)) { /* TODO: we should probably return a NULL handle here */ return dcesrv_handle_new(context, handle_type); } diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index c0d8c44e02..c605a05f6a 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -406,12 +406,12 @@ static bool test_Map_simple(struct torture_context *tctx, } while (NT_STATUS_IS_OK(status) && r.out.result == EPMAPPER_STATUS_OK && *r.out.num_ents == r.in.max_ents && - !policy_handle_empty(&entry_handle)); + !ndr_policy_handle_empty(&entry_handle)); torture_assert_ntstatus_ok(tctx, status, "epm_Map_simple failed"); torture_assert(tctx, - policy_handle_empty(&entry_handle), + ndr_policy_handle_empty(&entry_handle), "epm_Map_simple failed - The policy handle should be emtpy."); return true; @@ -427,7 +427,7 @@ static bool test_LookupHandleFree(struct torture_context *tctx, torture_skip(tctx, "Skip Insert test against Samba4"); } - if (policy_handle_empty(entry_handle)) { + if (ndr_policy_handle_empty(entry_handle)) { torture_comment(tctx, "epm_LookupHandleFree failed - empty policy_handle\n"); return false; @@ -504,13 +504,13 @@ static bool test_Lookup_simple(struct torture_context *tctx, } while (NT_STATUS_IS_OK(status) && r.out.result == EPMAPPER_STATUS_OK && *r.out.num_ents == r.in.max_ents && - !policy_handle_empty(&entry_handle)); + !ndr_policy_handle_empty(&entry_handle)); torture_assert_ntstatus_ok(tctx, status, "epm_Lookup failed"); torture_assert(tctx, r.out.result == EPMAPPER_STATUS_NO_MORE_ENTRIES, "epm_Lookup failed"); torture_assert(tctx, - policy_handle_empty(&entry_handle), + ndr_policy_handle_empty(&entry_handle), "epm_Lookup failed - The policy handle should be emtpy."); return true; diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 6b90791660..bf1d713eed 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -4,6 +4,7 @@ Copyright (C) Andrew Tridgell 2003 Copyright (C) Andrew Bartlett 2003 + Copyright (C) Jelmer Vernooij 2005-2007 Copyright (C) Guenther Deschner 2008-2010 This program is free software; you can redistribute it and/or modify @@ -5536,7 +5537,7 @@ static bool test_CreateUser2(struct dcerpc_pipe *p, struct torture_context *tctx ret = false; } - if (!policy_handle_empty(&user_handle)) { + if (!ndr_policy_handle_empty(&user_handle)) { torture_comment(tctx, "Testing DeleteUser (createuser2 test)\n"); d.in.user_handle = &user_handle; @@ -7483,7 +7484,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p, default: return false; } - if (!policy_handle_empty(&handles[i])) { + if (!ndr_policy_handle_empty(&handles[i])) { num_created++; } } @@ -7534,7 +7535,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p, for (i=0; i < num_total; i++) { - if (policy_handle_empty(&handles[i])) { + if (ndr_policy_handle_empty(&handles[i])) { continue; } @@ -7694,17 +7695,17 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx, break; } - if (!policy_handle_empty(&user_handle) && + if (!ndr_policy_handle_empty(&user_handle) && !test_DeleteUser(b, tctx, &user_handle)) { ret = false; } - if (!policy_handle_empty(&alias_handle) && + if (!ndr_policy_handle_empty(&alias_handle) && !test_DeleteAlias(b, tctx, &alias_handle)) { ret = false; } - if (!policy_handle_empty(&group_handle) && + if (!ndr_policy_handle_empty(&group_handle) && !test_DeleteDomainGroup(b, tctx, &group_handle)) { ret = false; } -- cgit