[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Mar 17 11:27:16 MDT 2010
The branch, master has been updated
via 4b80e14... s4:torture/rpc/samba3rpc.c: make use of dcerpc_binding_handle stubs
via 2d897be... s4:torture/rpc/samsync.c: make use of dcerpc_binding_handle stubs
via 532e034... s4:torture/rpc/samr_accessmask.c: make use of dcerpc_binding_handle stubs
via f400fc5... s4:torture/rpc/dssetup.c: make use of dcerpc_binding_handle stubs
via 6e8fd4d... s4:torture/rpc/bench.c: make use of dcerpc_binding_handle stubs
via aecd9dd... s4:torture/rpc/samlogon.c: make use of dcerpc_binding_handle stubs
via 9639afa... s4:torture/rpc/netlogon.c: make use of dcerpc_binding_handle stubs
via c05a0f7... s4:torture/rpc/schannel.c: make use of dcerpc_binding_handle stubs
via 2d31379... s4:torture/rpc/testjoin.c: make use of dcerpc_binding_handle stubs
via a91647d... s4:torture/rpc/samr.c: make use of dcerpc_binding_handle stubs
via 0422151... s4:librpc/rpc: initialize p->binding_handle in dcerpc_secondary_context()
from 4ca2cc3... s4-smbtorture: workaround broken REG_MULTI_SZ from winreg in s3 during SetPrinterDataEx SPOOLSS test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4b80e145b402a198ff7da2458cb4cebd9232bce2
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 17 12:09:53 2010 +0100
s4:torture/rpc/samba3rpc.c: make use of dcerpc_binding_handle stubs
metze
commit 2d897beb7ad5f6abc19b8c4dcaafaf897af9fd1f
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 17 12:05:10 2010 +0100
s4:torture/rpc/samsync.c: make use of dcerpc_binding_handle stubs
metze
commit 532e034e287705b34c84dc110dbf954d2e885972
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 15 09:01:17 2010 +0100
s4:torture/rpc/samr_accessmask.c: make use of dcerpc_binding_handle stubs
metze
commit f400fc54bce0f2fda5ce98238439f69283da91ac
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 17 12:06:05 2010 +0100
s4:torture/rpc/dssetup.c: make use of dcerpc_binding_handle stubs
metze
commit 6e8fd4df6078cb426a1a9233f796532590c2387f
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 17 12:05:42 2010 +0100
s4:torture/rpc/bench.c: make use of dcerpc_binding_handle stubs
metze
commit aecd9dd19573b2b27a301d3aca2ed201b9c3b8ce
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 16 11:34:04 2010 +0100
s4:torture/rpc/samlogon.c: make use of dcerpc_binding_handle stubs
metze
commit 9639afae694621c63f35c3ff46939bae5c1606a9
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 16 11:22:28 2010 +0100
s4:torture/rpc/netlogon.c: make use of dcerpc_binding_handle stubs
metze
commit c05a0f78236e595642b62271570acf96e5bba69d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 16 11:10:16 2010 +0100
s4:torture/rpc/schannel.c: make use of dcerpc_binding_handle stubs
metze
commit 2d31379853716b25ee2a0dcc58edc0f584742d55
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 16 10:55:41 2010 +0100
s4:torture/rpc/testjoin.c: make use of dcerpc_binding_handle stubs
metze
commit a91647d494c43b4430a9f339907e50c14187a35a
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Mar 12 17:51:06 2010 +0100
s4:torture/rpc/samr.c: make use of dcerpc_binding_handle stubs
metze
commit 04221518dab1a36610752cd97ec560f285dc2090
Author: Stefan Metzmacher <metze at sernet.private>
Date: Wed Mar 17 14:00:45 2010 +0100
s4:librpc/rpc: initialize p->binding_handle in dcerpc_secondary_context()
metze
-----------------------------------------------------------------------
Summary of changes:
source4/librpc/rpc/dcerpc_util.c | 7 +
source4/torture/rpc/bench.c | 3 +-
source4/torture/rpc/dssetup.c | 3 +-
source4/torture/rpc/netlogon.c | 160 ++++---
source4/torture/rpc/samba3rpc.c | 196 +++++---
source4/torture/rpc/samlogon.c | 22 +-
source4/torture/rpc/samr.c | 938 ++++++++++++++++++---------------
source4/torture/rpc/samr_accessmask.c | 152 +++---
source4/torture/rpc/samsync.c | 68 ++-
source4/torture/rpc/schannel.c | 21 +-
source4/torture/rpc/testjoin.c | 31 +-
11 files changed, 909 insertions(+), 692 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 768a386..8fd17bd 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -755,6 +755,13 @@ _PUBLIC_ NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p,
p2->binding = talloc_reference(p2, p->binding);
+ p2->binding_handle = talloc(p2, struct dcerpc_binding_handle);
+ if (p2->binding_handle == NULL) {
+ talloc_free(p2);
+ return NT_STATUS_NO_MEMORY;
+ }
+ p2->binding_handle->private_data = p2;
+
status = dcerpc_alter_context(p2, p2, &p2->syntax, &p2->transfer_syntax);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(p2);
diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index 0c7477c..74fb939 100644
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -41,6 +41,7 @@ static bool test_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
int i;
bool ret = true;
uint32_t resume_handle;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(info_ctr);
@@ -79,7 +80,7 @@ static bool test_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
break;
}
- status = dcerpc_srvsvc_NetShareEnumAll(p, mem_ctx, &r);
+ status = dcerpc_srvsvc_NetShareEnumAll_r(b, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
printf("NetShareEnumAll level %u failed - %s\n", info_ctr.level, nt_errstr(status));
ret = false;
diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c
index f52aa9f..f4947ff 100644
--- a/source4/torture/rpc/dssetup.c
+++ b/source4/torture/rpc/dssetup.c
@@ -31,12 +31,13 @@ bool test_DsRoleGetPrimaryDomainInformation_ext(struct torture_context *tctx,
struct dssetup_DsRoleGetPrimaryDomainInformation r;
NTSTATUS status;
int i;
+ struct dcerpc_binding_handle *b = p->binding_handle;
for (i=DS_ROLE_BASIC_INFORMATION; i <= DS_ROLE_OP_STATUS; i++) {
r.in.level = i;
torture_comment(tctx, "dcerpc_dssetup_DsRoleGetPrimaryDomainInformation level %d\n", i);
- status = dcerpc_dssetup_DsRoleGetPrimaryDomainInformation(p, tctx, &r);
+ status = dcerpc_dssetup_DsRoleGetPrimaryDomainInformation_r(b, tctx, &r);
torture_assert_ntstatus_equal(tctx, ext_status, status, "DsRoleGetPrimaryDomainInformation failed");
if (NT_STATUS_IS_OK(ext_status)) {
torture_assert_werr_ok(tctx, r.out.result, "DsRoleGetPrimaryDomainInformation failed");
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 4d14d6e..b8d75f5 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -44,13 +44,14 @@ static bool test_LogonUasLogon(struct torture_context *tctx,
NTSTATUS status;
struct netr_LogonUasLogon r;
struct netr_UasInfo *info = NULL;
+ struct dcerpc_binding_handle *b = p->binding_handle;
r.in.server_name = NULL;
r.in.account_name = cli_credentials_get_username(cmdline_credentials);
r.in.workstation = TEST_MACHINE_NAME;
r.out.info = &info;
- status = dcerpc_netr_LogonUasLogon(p, tctx, &r);
+ status = dcerpc_netr_LogonUasLogon_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonUasLogon");
return true;
@@ -62,13 +63,14 @@ static bool test_LogonUasLogoff(struct torture_context *tctx,
NTSTATUS status;
struct netr_LogonUasLogoff r;
struct netr_UasLogoffInfo info;
+ struct dcerpc_binding_handle *b = p->binding_handle;
r.in.server_name = NULL;
r.in.account_name = cli_credentials_get_username(cmdline_credentials);
r.in.workstation = TEST_MACHINE_NAME;
r.out.info = &info;
- status = dcerpc_netr_LogonUasLogoff(p, tctx, &r);
+ status = dcerpc_netr_LogonUasLogoff_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonUasLogoff");
return true;
@@ -85,6 +87,7 @@ bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context *tctx,
struct netlogon_creds_CredentialState *creds;
const struct samr_Password *mach_password;
const char *machine_name;
+ struct dcerpc_binding_handle *b = p->binding_handle;
mach_password = cli_credentials_get_nt_hash(credentials, tctx);
machine_name = cli_credentials_get_workstation(credentials);
@@ -98,7 +101,7 @@ bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context *tctx,
generate_random_buffer(credentials1.data, sizeof(credentials1.data));
- status = dcerpc_netr_ServerReqChallenge(p, tctx, &r);
+ status = dcerpc_netr_ServerReqChallenge_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerReqChallenge");
a.in.server_name = NULL;
@@ -118,7 +121,7 @@ bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context *tctx,
torture_comment(tctx, "Testing ServerAuthenticate\n");
- status = dcerpc_netr_ServerAuthenticate(p, tctx, &a);
+ status = dcerpc_netr_ServerAuthenticate_r(b, tctx, &a);
/* This allows the tests to continue against the more fussy windows 2008 */
if (NT_STATUS_EQUAL(status, NT_STATUS_DOWNGRADE_DETECTED)) {
@@ -150,6 +153,7 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
struct netlogon_creds_CredentialState *creds;
const struct samr_Password *mach_password;
const char *machine_name;
+ struct dcerpc_binding_handle *b = p->binding_handle;
mach_password = cli_credentials_get_nt_hash(machine_credentials, tctx);
machine_name = cli_credentials_get_workstation(machine_credentials);
@@ -164,7 +168,7 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
generate_random_buffer(credentials1.data, sizeof(credentials1.data));
- status = dcerpc_netr_ServerReqChallenge(p, tctx, &r);
+ status = dcerpc_netr_ServerReqChallenge_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerReqChallenge");
a.in.server_name = NULL;
@@ -186,7 +190,7 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
torture_comment(tctx, "Testing ServerAuthenticate2\n");
- status = dcerpc_netr_ServerAuthenticate2(p, tctx, &a);
+ status = dcerpc_netr_ServerAuthenticate2_r(b, tctx, &a);
torture_assert_ntstatus_ok(tctx, status, "ServerAuthenticate2");
torture_assert(tctx, netlogon_creds_client_check(creds, &credentials3),
@@ -213,6 +217,7 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
uint32_t rid;
const char *machine_name;
const char *plain_pass;
+ struct dcerpc_binding_handle *b = p->binding_handle;
machine_name = cli_credentials_get_workstation(machine_credentials);
plain_pass = cli_credentials_get_password(machine_credentials);
@@ -226,7 +231,7 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
generate_random_buffer(credentials1.data, sizeof(credentials1.data));
- status = dcerpc_netr_ServerReqChallenge(p, tctx, &r);
+ status = dcerpc_netr_ServerReqChallenge_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerReqChallenge");
E_md4hash(plain_pass, mach_password.hash);
@@ -251,14 +256,14 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
torture_comment(tctx, "Testing ServerAuthenticate3\n");
- status = dcerpc_netr_ServerAuthenticate3(p, tctx, &a);
+ status = dcerpc_netr_ServerAuthenticate3_r(b, tctx, &a);
torture_assert_ntstatus_ok(tctx, status, "ServerAuthenticate3");
torture_assert(tctx, netlogon_creds_client_check(creds, &credentials3), "Credential chaining failed");
torture_comment(tctx, "negotiate_flags=0x%08x\n", negotiate_flags);
/* Prove that requesting a challenge again won't break it */
- status = dcerpc_netr_ServerReqChallenge(p, tctx, &r);
+ status = dcerpc_netr_ServerReqChallenge_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerReqChallenge");
*creds_out = creds;
@@ -278,6 +283,7 @@ static bool test_SetPassword(struct torture_context *tctx,
struct netlogon_creds_CredentialState *creds;
struct netr_Authenticator credential, return_authenticator;
struct samr_Password new_password;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -302,7 +308,7 @@ static bool test_SetPassword(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -320,7 +326,7 @@ static bool test_SetPassword(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (2)");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -350,6 +356,7 @@ static bool test_SetPassword_flags(struct torture_context *tctx,
struct netlogon_creds_CredentialState *creds;
struct netr_Authenticator credential, return_authenticator;
struct samr_Password new_password;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials2(p, tctx, negotiate_flags,
machine_credentials,
@@ -377,7 +384,7 @@ static bool test_SetPassword_flags(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -395,7 +402,7 @@ static bool test_SetPassword_flags(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (2)");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -446,6 +453,7 @@ static bool test_SetPassword2(struct torture_context *tctx,
struct samr_Password nt_hash;
struct netr_Authenticator credential, return_authenticator;
struct netr_CryptPassword new_password;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -471,7 +479,7 @@ static bool test_SetPassword2(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet2_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet2");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -503,7 +511,7 @@ static bool test_SetPassword2(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet2_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet2");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -529,7 +537,7 @@ static bool test_SetPassword2(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet2_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet2 (2)");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -547,7 +555,7 @@ static bool test_SetPassword2(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet2_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (3)");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -575,7 +583,7 @@ static bool test_SetPassword2(struct torture_context *tctx,
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordSet2_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (3)");
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
@@ -604,6 +612,7 @@ static bool test_GetPassword(struct torture_context *tctx,
NTSTATUS status;
struct netr_Authenticator return_authenticator;
struct samr_Password password;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -619,7 +628,7 @@ static bool test_GetPassword(struct torture_context *tctx,
r.out.return_authenticator = &return_authenticator;
r.out.password = &password;
- status = dcerpc_netr_ServerPasswordGet(p, tctx, &r);
+ status = dcerpc_netr_ServerPasswordGet_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerPasswordGet");
return true;
@@ -635,6 +644,7 @@ static bool test_GetTrustPasswords(struct torture_context *tctx,
NTSTATUS status;
struct netr_Authenticator return_authenticator;
struct samr_Password password, password2;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -651,7 +661,7 @@ static bool test_GetTrustPasswords(struct torture_context *tctx,
r.out.password = &password;
r.out.password2 = &password2;
- status = dcerpc_netr_ServerTrustPasswordsGet(p, tctx, &r);
+ status = dcerpc_netr_ServerTrustPasswordsGet_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "ServerTrustPasswordsGet");
return true;
@@ -674,6 +684,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
struct netr_NetworkInfo ninfo;
DATA_BLOB names_blob, chal, lm_resp, nt_resp;
int i;
+ struct dcerpc_binding_handle *b = p->binding_handle;
int flags = CLI_CRED_NTLM_AUTH;
if (lp_client_lanman_auth(tctx->lp_ctx)) {
flags |= CLI_CRED_LANMAN_AUTH;
@@ -737,7 +748,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
r.in.validation_level = i;
- status = dcerpc_netr_LogonSamLogon(p, tctx, &r);
+ status = dcerpc_netr_LogonSamLogon_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonSamLogon failed");
torture_assert(tctx, netlogon_creds_client_check(creds,
@@ -753,7 +764,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
torture_comment(tctx, "Testing SamLogon with validation level %d and a NULL credential\n", i);
- status = dcerpc_netr_LogonSamLogon(p, tctx, &r);
+ status = dcerpc_netr_LogonSamLogon_r(b, tctx, &r);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_INVALID_PARAMETER,
"LogonSamLogon expected INVALID_PARAMETER");
@@ -815,6 +826,7 @@ static bool test_DatabaseSync(struct torture_context *tctx,
int i;
struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
struct netr_Authenticator credential, return_authenticator;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -844,7 +856,7 @@ static bool test_DatabaseSync(struct torture_context *tctx,
r.in.credential = &credential;
- status = dcerpc_netr_DatabaseSync(p, tctx, &r);
+ status = dcerpc_netr_DatabaseSync_r(b, tctx, &r);
if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES))
break;
@@ -890,6 +902,7 @@ static bool test_DatabaseDeltas(struct torture_context *tctx,
struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
const uint32_t database_ids[] = {0, 1, 2};
int i;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -916,7 +929,7 @@ static bool test_DatabaseDeltas(struct torture_context *tctx,
do {
netlogon_creds_client_authenticator(creds, &credential);
- status = dcerpc_netr_DatabaseDeltas(p, tctx, &r);
+ status = dcerpc_netr_DatabaseDeltas_r(b, tctx, &r);
if (NT_STATUS_EQUAL(status,
NT_STATUS_SYNCHRONIZATION_REQUIRED)) {
torture_comment(tctx, "not considering %s to be an error\n",
@@ -952,6 +965,7 @@ static bool test_DatabaseRedo(struct torture_context *tctx,
struct netr_ChangeLogEntry e;
struct dom_sid null_sid, *sid;
int i,d;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(null_sid);
@@ -1433,7 +1447,7 @@ static bool test_DatabaseRedo(struct torture_context *tctx,
torture_comment(tctx, "Testing DatabaseRedo with database %s and %s\n",
database, changes[i].comment);
- status = dcerpc_netr_DatabaseRedo(p, tctx, &r);
+ status = dcerpc_netr_DatabaseRedo_r(b, tctx, &r);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
return true;
}
@@ -1487,6 +1501,7 @@ static bool test_AccountDeltas(struct torture_context *tctx,
uint32_t total_entries = 0;
struct netr_UAS_INFO_0 recordid;
struct netr_Authenticator return_authenticator;
+ struct dcerpc_binding_handle *b = p->binding_handle;
if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
return false;
@@ -1509,7 +1524,7 @@ static bool test_AccountDeltas(struct torture_context *tctx,
r.out.return_authenticator = &return_authenticator;
/* w2k3 returns "NOT IMPLEMENTED" for this call */
- status = dcerpc_netr_AccountDeltas(p, tctx, &r);
+ status = dcerpc_netr_AccountDeltas_r(b, tctx, &r);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NOT_IMPLEMENTED, "AccountDeltas");
return true;
@@ -1531,6 +1546,7 @@ static bool test_AccountSync(struct torture_context *tctx, struct dcerpc_pipe *p
uint32_t next_reference = 0;
struct netr_UAS_INFO_0 recordid;
struct netr_Authenticator return_authenticator;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(recordid);
ZERO_STRUCT(return_authenticator);
@@ -1555,7 +1571,7 @@ static bool test_AccountSync(struct torture_context *tctx, struct dcerpc_pipe *p
r.out.return_authenticator = &return_authenticator;
/* w2k3 returns "NOT IMPLEMENTED" for this call */
- status = dcerpc_netr_AccountSync(p, tctx, &r);
+ status = dcerpc_netr_AccountSync_r(b, tctx, &r);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NOT_IMPLEMENTED, "AccountSync");
return true;
@@ -1570,12 +1586,13 @@ static bool test_GetDcName(struct torture_context *tctx,
NTSTATUS status;
struct netr_GetDcName r;
const char *dcname = NULL;
+ struct dcerpc_binding_handle *b = p->binding_handle;
r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
r.in.domainname = lp_workgroup(tctx->lp_ctx);
r.out.dcname = &dcname;
- status = dcerpc_netr_GetDcName(p, tctx, &r);
+ status = dcerpc_netr_GetDcName_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "GetDcName");
torture_assert_werr_ok(tctx, r.out.result, "GetDcName");
@@ -1640,6 +1657,7 @@ static bool test_LogonControl(struct torture_context *tctx,
union netr_CONTROL_QUERY_INFORMATION query;
int i,f;
enum netr_SchannelType secure_channel_type = SEC_CHAN_NULL;
+ struct dcerpc_binding_handle *b = p->binding_handle;
uint32_t function_codes[] = {
NETLOGON_CONTROL_QUERY,
@@ -1680,7 +1698,7 @@ static bool test_LogonControl(struct torture_context *tctx,
torture_comment(tctx, "Testing LogonControl function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
- status = dcerpc_netr_LogonControl(p, tctx, &r);
+ status = dcerpc_netr_LogonControl_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl");
switch (r.in.level) {
@@ -1754,12 +1772,13 @@ static bool test_GetAnyDCName(struct torture_context *tctx,
NTSTATUS status;
struct netr_GetAnyDCName r;
const char *dcname = NULL;
+ struct dcerpc_binding_handle *b = p->binding_handle;
r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
r.in.domainname = lp_workgroup(tctx->lp_ctx);
r.out.dcname = &dcname;
- status = dcerpc_netr_GetAnyDCName(p, tctx, &r);
+ status = dcerpc_netr_GetAnyDCName_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "GetAnyDCName");
torture_assert_werr_ok(tctx, r.out.result, "GetAnyDCName");
@@ -1784,6 +1803,7 @@ static bool test_LogonControl2(struct torture_context *tctx,
union netr_CONTROL_DATA_INFORMATION data;
union netr_CONTROL_QUERY_INFORMATION query;
int i;
+ struct dcerpc_binding_handle *b = p->binding_handle;
data.domain = lp_workgroup(tctx->lp_ctx);
@@ -1799,7 +1819,7 @@ static bool test_LogonControl2(struct torture_context *tctx,
torture_comment(tctx, "Testing LogonControl2 level %d function %d\n",
i, r.in.function_code);
- status = dcerpc_netr_LogonControl2(p, tctx, &r);
+ status = dcerpc_netr_LogonControl2_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl");
}
@@ -1814,7 +1834,7 @@ static bool test_LogonControl2(struct torture_context *tctx,
torture_comment(tctx, "Testing LogonControl2 level %d function %d\n",
i, r.in.function_code);
- status = dcerpc_netr_LogonControl2(p, tctx, &r);
+ status = dcerpc_netr_LogonControl2_r(b, tctx, &r);
--
Samba Shared Repository
More information about the samba-cvs
mailing list