summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/epmapper.c10
-rw-r--r--source4/torture/rpc/samr.c13
2 files changed, 12 insertions, 11 deletions
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 <abartlet@samba.org> 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;
}