r13924: Split more prototypes out of include/proto.h + initial work on header
[jelmer/samba4-debian.git] / source / torture / rpc / netlogon.c
index b49ba1ef5591d0e83f09e009b96269993b9dd12b..e786dd38982e973011b35fe9690d89fd36903d94 100644 (file)
 */
 
 #include "includes.h"
+#include "torture/torture.h"
+#include "lib/events/events.h"
+#include "auth/auth.h"
+#include "smb.h"
+#include "lib/cmdline/popt_common.h"
+#include "torture/rpc/proto.h"
+#include "libcli/auth/proto.h"
 
+static const char *machine_password;
 
 #define TEST_MACHINE_NAME "torturetest"
 
-/* for the timebeing, use the same neg flags as Samba3. */
-/* The 7 here seems to be required to get Win2k not to downgrade us
-   to NT4.  Actually, anything other than 1ff would seem to do... */
-#define NETLOGON_NEG_AUTH2_FLAGS 0x000701ff
-
-#define NETLOGON_NEG_SCHANNEL    0x40000000
-
-
-static struct {
-       struct dcerpc_pipe *p;
-       const char *machine_password;
-       struct policy_handle acct_handle;
-} join;
-
-/*
-  join the domain as a BDC
-*/
-static BOOL join_domain_bdc(TALLOC_CTX *mem_ctx)
-{
-       NTSTATUS status;
-       struct samr_Connect c;
-       struct samr_CreateUser2 r;
-       struct samr_OpenDomain o;
-       struct samr_LookupDomain l;
-       struct samr_SetUserInfo s;
-       union samr_UserInfo u;
-       struct policy_handle handle;
-       struct policy_handle domain_handle;
-       uint32 access_granted;
-       uint32 rid;
-       BOOL ret = True;
-       DATA_BLOB session_key;
-       struct samr_Name name;
-
-       printf("Connecting to SAMR\n");
-
-       status = torture_rpc_connection(&join.p, 
-                                       DCERPC_SAMR_NAME,
-                                       DCERPC_SAMR_UUID,
-                                       DCERPC_SAMR_VERSION);
-       if (!NT_STATUS_IS_OK(status)) {
-               return False;
-       }
-
-       c.in.system_name = NULL;
-       c.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       c.out.handle = &handle;
-
-       status = dcerpc_samr_Connect(join.p, mem_ctx, &c);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("samr_Connect failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       printf("Opening domain %s\n", lp_workgroup());
-
-       name.name = lp_workgroup();
-       l.in.handle = &handle;
-       l.in.domain = &name;
-
-       status = dcerpc_samr_LookupDomain(join.p, mem_ctx, &l);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("LookupDomain failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       o.in.handle = &handle;
-       o.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       o.in.sid = l.out.sid;
-       o.out.domain_handle = &domain_handle;
-
-       status = dcerpc_samr_OpenDomain(join.p, mem_ctx, &o);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenDomain failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       printf("Creating machine account %s\n", TEST_MACHINE_NAME);
-
-again:
-       name.name = talloc_asprintf(mem_ctx, "%s$", TEST_MACHINE_NAME);
-       r.in.handle = &domain_handle;
-       r.in.username = &name;
-       r.in.acct_flags = ACB_SVRTRUST;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r.out.acct_handle = &join.acct_handle;
-       r.out.access_granted = &access_granted;
-       r.out.rid = &rid;
-
-       status = dcerpc_samr_CreateUser2(join.p, mem_ctx, &r);
-
-       if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS) &&
-           test_DeleteUser_byname(join.p, mem_ctx, &domain_handle, name.name)) {
-               goto again;
-       }
-
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("CreateUser2 failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       join.machine_password = generate_random_str(8);
-
-       printf("Setting machine account password '%s'\n", join.machine_password);
-
-       s.in.handle = &join.acct_handle;
-       s.in.info = &u;
-       s.in.level = 24;
-
-       encode_pw_buffer(u.info24.password.data, join.machine_password, STR_UNICODE);
-       u.info24.pw_len = strlen(join.machine_password);
-
-       status = dcerpc_fetch_session_key(join.p, &session_key);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("SetUserInfo level %u - no session key - %s\n",
-                      s.in.level, nt_errstr(status));
-               return False;
-       }
-
-       SamOEMhashBlob(u.info24.password.data, 516, &session_key);
-
-       status = dcerpc_samr_SetUserInfo(join.p, mem_ctx, &s);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("SetUserInfo failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       s.in.handle = &join.acct_handle;
-       s.in.info = &u;
-       s.in.level = 16;
-
-       u.info16.acct_flags = ACB_SVRTRUST;
-
-       printf("Resetting ACB flags\n");
-
-       status = dcerpc_samr_SetUserInfo(join.p, mem_ctx, &s);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("SetUserInfo failed - %s\n", nt_errstr(status));
-               return False;
-       }
-
-       return ret;
-}
-
-/*
-  leave the domain as a BDC
-*/
-static BOOL leave_domain_bdc(TALLOC_CTX *mem_ctx)
-{
-       struct samr_DeleteUser d;
-       NTSTATUS status;
-
-       d.in.handle = &join.acct_handle;
-       d.out.handle = &join.acct_handle;
-
-       status = dcerpc_samr_DeleteUser(join.p, mem_ctx, &d);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Delete of machine account failed\n");
-               return False;
-       }
-
-       return True;
-}
-
 static BOOL test_LogonUasLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_LogonUasLogon r;
 
        r.in.server_name = NULL;
-       r.in.username = lp_parm_string(-1, "torture", "username");
+       r.in.account_name = cli_credentials_get_username(cmdline_credentials);
        r.in.workstation = TEST_MACHINE_NAME;
 
        printf("Testing LogonUasLogon\n");
@@ -218,7 +62,7 @@ static BOOL test_LogonUasLogoff(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct netr_LogonUasLogoff r;
 
        r.in.server_name = NULL;
-       r.in.username = lp_parm_string(-1, "torture", "username");
+       r.in.account_name = cli_credentials_get_username(cmdline_credentials);
        r.in.workstation = TEST_MACHINE_NAME;
 
        printf("Testing LogonUasLogoff\n");
@@ -234,19 +78,30 @@ static BOOL test_LogonUasLogoff(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                                 struct creds_CredentialState *creds)
+                          const char *machine_name,
+                          const char *plain_pass,
+                          struct creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate a;
-       const char *plain_pass;
-       uint8 mach_pwd[16];
+       struct netr_Credential credentials1, credentials2, credentials3;
+       struct creds_CredentialState *creds;
+       struct samr_Password mach_password;
 
        printf("Testing ServerReqChallenge\n");
 
+       creds = talloc(mem_ctx, struct creds_CredentialState);
+       if (!creds) {
+               return False;
+       }
+
        r.in.server_name = NULL;
-       r.in.computer_name = TEST_MACHINE_NAME;
-       generate_random_buffer(r.in.credentials.data, sizeof(r.in.credentials.data), False);
+       r.in.computer_name = machine_name;
+       r.in.credentials = &credentials1;
+       r.out.credentials = &credentials2;
+
+       generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
        status = dcerpc_netr_ServerReqChallenge(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -254,21 +109,18 @@ static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       plain_pass = join.machine_password;
-       if (!plain_pass) {
-               printf("Unable to fetch machine password!\n");
-               return False;
-       }
-
-       E_md4hash(plain_pass, mach_pwd);
-
-       creds_client_init(creds, &r.in.credentials, &r.out.credentials, mach_pwd,
-                         &a.in.credentials);
+       E_md4hash(plain_pass, mach_password.hash);
 
        a.in.server_name = NULL;
-       a.in.username = talloc_asprintf(mem_ctx, "%s$", TEST_MACHINE_NAME);
+       a.in.account_name = talloc_asprintf(mem_ctx, "%s$", machine_name);
        a.in.secure_channel_type = SEC_CHAN_BDC;
-       a.in.computer_name = TEST_MACHINE_NAME;
+       a.in.computer_name = machine_name;
+       a.in.credentials = &credentials3;
+       a.out.credentials = &credentials3;
+
+       creds_client_init(creds, &credentials1, &credentials2, 
+                         &mach_password, &credentials3, 
+                         0);
 
        printf("Testing ServerAuthenticate\n");
 
@@ -278,29 +130,42 @@ static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       if (!creds_client_check(creds, &a.out.credentials)) {
+       if (!creds_client_check(creds, &credentials3)) {
                printf("Credential chaining failed\n");
                return False;
        }
 
+       *creds_out = creds;
        return True;
 }
 
 static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                                  uint32 negotiate_flags,
-                                  struct creds_CredentialState *creds)
+                           uint32_t negotiate_flags,
+                           const char *machine_name,
+                           const char *plain_pass,
+                           int sec_chan_type,
+                           struct creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate2 a;
-       const char *plain_pass;
-       uint8 mach_pwd[16];
+       struct netr_Credential credentials1, credentials2, credentials3;
+       struct creds_CredentialState *creds;
+       struct samr_Password mach_password;
 
        printf("Testing ServerReqChallenge\n");
 
+       creds = talloc(mem_ctx, struct creds_CredentialState);
+       if (!creds) {
+               return False;
+       }
+
        r.in.server_name = NULL;
-       r.in.computer_name = TEST_MACHINE_NAME;
-       generate_random_buffer(r.in.credentials.data, sizeof(r.in.credentials.data), False);
+       r.in.computer_name = machine_name;
+       r.in.credentials = &credentials1;
+       r.out.credentials = &credentials2;
+
+       generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
        status = dcerpc_netr_ServerReqChallenge(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -308,23 +173,20 @@ static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       plain_pass = join.machine_password;
-       if (!plain_pass) {
-               printf("Unable to fetch machine password!\n");
-               return False;
-       }
-
-       E_md4hash(plain_pass, mach_pwd);
-
-       creds_client_init(creds, &r.in.credentials, &r.out.credentials, mach_pwd,
-                         &a.in.credentials);
+       E_md4hash(plain_pass, mach_password.hash);
 
        a.in.server_name = NULL;
-       a.in.username = talloc_asprintf(mem_ctx, "%s$", TEST_MACHINE_NAME);
-       a.in.secure_channel_type = SEC_CHAN_BDC;
-       a.in.computer_name = TEST_MACHINE_NAME;
+       a.in.account_name = talloc_asprintf(mem_ctx, "%s$", machine_name);
+       a.in.secure_channel_type = sec_chan_type;
+       a.in.computer_name = machine_name;
        a.in.negotiate_flags = &negotiate_flags;
        a.out.negotiate_flags = &negotiate_flags;
+       a.in.credentials = &credentials3;
+       a.out.credentials = &credentials3;
+
+       creds_client_init(creds, &credentials1, &credentials2, 
+                         &mach_password, &credentials3, 
+                         negotiate_flags);
 
        printf("Testing ServerAuthenticate2\n");
 
@@ -334,734 +196,415 @@ static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       if (!creds_client_check(creds, &a.out.credentials)) {
+       if (!creds_client_check(creds, &credentials3)) {
                printf("Credential chaining failed\n");
                return False;
        }
 
        printf("negotiate_flags=0x%08x\n", negotiate_flags);
 
+       *creds_out = creds;
        return True;
 }
 
-enum ntlm_break {
-       BREAK_NONE,
-       BREAK_LM,
-       BREAK_NT,
-       NO_LM,
-       NO_NT
-};
 
-struct samlogon_state {
-       TALLOC_CTX *mem_ctx;
-       const char *username;
-       const char *password;
-       struct dcerpc_pipe *p;
-       struct netr_LogonSamLogon r;
-       struct netr_Authenticator auth, auth2;
-       struct creds_CredentialState creds;
-       DATA_BLOB chall;
-};
-
-/* 
-   Authenticate a user with a challenge/response, checking session key
-   and valid authentication types
-*/
-
-static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state, 
-                              enum ntlm_break break_which,
-                              DATA_BLOB *chall, 
-                              DATA_BLOB *lm_response, 
-                              DATA_BLOB *nt_response, 
-                              uint8 lm_key[8], 
-                              uint8 user_session_key[16], 
-                              char **error_string)
+static BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                           uint32_t negotiate_flags,
+                           const char *machine_name,
+                           const char *plain_pass,
+                           struct creds_CredentialState **creds_out)
 {
        NTSTATUS status;
-       struct netr_LogonSamLogon *r = &samlogon_state->r;
+       struct netr_ServerReqChallenge r;
+       struct netr_ServerAuthenticate3 a;
+       struct netr_Credential credentials1, credentials2, credentials3;
+       struct creds_CredentialState *creds;
+       struct samr_Password mach_password;
+       uint32_t rid;
 
-       struct netr_NetworkInfo ninfo;
-       samlogon_state->r.in.logon_level = 2;
-       samlogon_state->r.in.logon.network = &ninfo;
-       
-       ninfo.logon_info.domain_name.string = lp_workgroup();
-       ninfo.logon_info.parameter_control = 0;
-       ninfo.logon_info.logon_id_low = 0;
-       ninfo.logon_info.logon_id_high = 0;
-       ninfo.logon_info.username.string = samlogon_state->username;
-       ninfo.logon_info.workstation.string = TEST_MACHINE_NAME;
-
-       memcpy(ninfo.challenge, chall->data, 8);
-       
-       switch (break_which) {
-       case BREAK_NONE:
-               break;
-       case BREAK_LM:
-               if (lm_response && lm_response->data) {
-                       lm_response->data[0]++;
-               }
-               break;
-       case BREAK_NT:
-               if (nt_response && nt_response->data) {
-                       nt_response->data[0]++;
-               }
-               break;
-       case NO_LM:
-               data_blob_free(lm_response);
-               break;
-       case NO_NT:
-               data_blob_free(nt_response);
-               break;
-       }
-       
-       if (nt_response) {
-               ninfo.nt.data = nt_response->data;
-               ninfo.nt.length = nt_response->length;
-       } else {
-               ninfo.nt.data = NULL;
-               ninfo.nt.length = 0;
-       }
+       printf("Testing ServerReqChallenge\n");
 
-       if (lm_response) {
-               ninfo.lm.data = lm_response->data;
-               ninfo.lm.length = lm_response->length;
-       } else {
-               ninfo.lm.data = NULL;
-               ninfo.lm.length = 0;
+       creds = talloc(mem_ctx, struct creds_CredentialState);
+       if (!creds) {
+               return False;
        }
 
-       ZERO_STRUCT(samlogon_state->auth2);
-       creds_client_authenticator(&samlogon_state->creds, &samlogon_state->auth);
-       
-       status = dcerpc_netr_LogonSamLogon(samlogon_state->p, samlogon_state->mem_ctx, r);
-       if (!NT_STATUS_IS_OK(status)) {
-               if (error_string) {
-                       *error_string = strdup(nt_errstr(status));
-               }
-       }
-       
-       if (!creds_client_check(&samlogon_state->creds, &r->out.authenticator->cred)) {
-               printf("Credential chaining failed\n");
-       }
+       r.in.server_name = NULL;
+       r.in.computer_name = machine_name;
+       r.in.credentials = &credentials1;
+       r.out.credentials = &credentials2;
+
+       generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
+       status = dcerpc_netr_ServerReqChallenge(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               /* we cannot check the session key, if the logon failed... */
-               return status;
+               printf("ServerReqChallenge - %s\n", nt_errstr(status));
+               return False;
        }
-       
-       /* find and decyrpt the session keys, return in parameters above */
-       if (r->in.validation_level == 2) {
-               static const char zeros[16];
-
-               if (memcmp(r->out.validation.sam->LMSessKey.key, zeros,  sizeof(r->out.validation.sam->LMSessKey.key)) != 0) {
-                       creds_arcfour_crypt(&samlogon_state->creds, 
-                                           r->out.validation.sam->LMSessKey.key, 
-                                           sizeof(r->out.validation.sam->LMSessKey.key));
-               }
-                       
-               if (lm_key) {
-                       memcpy(lm_key, r->out.validation.sam->LMSessKey.key, 8);
-               }
 
-               if (memcmp(r->out.validation.sam->key.key, zeros,  sizeof(r->out.validation.sam->key.key)) != 0) {
-                       creds_arcfour_crypt(&samlogon_state->creds, 
-                                           r->out.validation.sam->key.key, 
-                                           sizeof(r->out.validation.sam->key.key));
-               }
+       E_md4hash(plain_pass, mach_password.hash);
 
-               if (user_session_key) {
-                       memcpy(user_session_key, r->out.validation.sam->key.key, 16);
-               }
+       a.in.server_name = NULL;
+       a.in.account_name = talloc_asprintf(mem_ctx, "%s$", machine_name);
+       a.in.secure_channel_type = SEC_CHAN_BDC;
+       a.in.computer_name = machine_name;
+       a.in.negotiate_flags = &negotiate_flags;
+       a.in.credentials = &credentials3;
+       a.out.credentials = &credentials3;
+       a.out.negotiate_flags = &negotiate_flags;
+       a.out.rid = &rid;
 
-       } else if (r->in.validation_level == 3) {
-               static const char zeros[16];
-               if (memcmp(r->out.validation.sam2->LMSessKey.key, zeros,  sizeof(r->out.validation.sam2->LMSessKey.key)) != 0) {
-                       creds_arcfour_crypt(&samlogon_state->creds, 
-                                           r->out.validation.sam2->LMSessKey.key, 
-                                           sizeof(r->out.validation.sam2->LMSessKey.key));
-               }
+       creds_client_init(creds, &credentials1, &credentials2, 
+                         &mach_password, &credentials3,
+                         negotiate_flags);
 
-               if (lm_key) {
-                       memcpy(lm_key, r->out.validation.sam2->LMSessKey.key, 8);
-               }
+       printf("Testing ServerAuthenticate3\n");
 
-               if (memcmp(r->out.validation.sam2->key.key, zeros,  sizeof(r->out.validation.sam2->key.key)) != 0) {
-                       creds_arcfour_crypt(&samlogon_state->creds, 
-                                           r->out.validation.sam2->key.key, 
-                                           sizeof(r->out.validation.sam2->key.key));
-               }
+       status = dcerpc_netr_ServerAuthenticate3(p, mem_ctx, &a);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerAuthenticate3 - %s\n", nt_errstr(status));
+               return False;
+       }
 
-               if (user_session_key) {
-                       memcpy(user_session_key, r->out.validation.sam2->key.key, 16);
-               }
+       if (!creds_client_check(creds, &credentials3)) {
+               printf("Credential chaining failed\n");
+               return False;
        }
 
-       return status;
-} 
+       printf("negotiate_flags=0x%08x\n", negotiate_flags);
 
-/* 
- * Test the normal 'LM and NTLM' combination
- */
+       *creds_out = creds;
+       return True;
+}
 
-static BOOL test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm_break break_which, char **error_string) 
+/*
+  try a change password for our machine account
+*/
+static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       DATA_BLOB lm_response = data_blob_talloc(samlogon_state->mem_ctx, NULL, 24);
-       DATA_BLOB nt_response = data_blob_talloc(samlogon_state->mem_ctx, NULL, 24);
-       DATA_BLOB session_key = data_blob_talloc(samlogon_state->mem_ctx, NULL, 16);
-
-       uchar lm_key[8];
-       uchar user_session_key[16];
-       uchar lm_hash[16];
-       uchar nt_hash[16];
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(user_session_key);
-
-       SMBencrypt(samlogon_state->password, samlogon_state->chall.data, lm_response.data);
-       E_deshash(samlogon_state->password, lm_hash); 
-
-       SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data, nt_response.data);
-
-       E_md4hash(samlogon_state->password, nt_hash);
-       SMBsesskeygen_ntv1(nt_hash, session_key.data);
+       NTSTATUS status;
+       struct netr_ServerPasswordSet r;
+       const char *password;
+       struct creds_CredentialState *creds;
 
-       nt_status = check_samlogon(samlogon_state,
-                                  break_which,
-                                  &samlogon_state->chall,
-                                  &lm_response,
-                                  &nt_response,
-                                  lm_key, 
-                                  user_session_key,
-                                  error_string);
-       
-       data_blob_free(&lm_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               return break_which == BREAK_NT;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               printf("LM Key does not match expectations!\n");
-               printf("lm_key:\n");
-               dump_data(1, (const char *)lm_key, 8);
-               printf("expected:\n");
-               dump_data(1, (const char *)lm_hash, 8);
-               pass = False;
-       }
-
-       if (break_which == NO_NT) {
-               char lm_key_expected[16];
-               memcpy(lm_key_expected, lm_hash, 8);
-               memset(lm_key_expected+8, '\0', 8);
-               if (memcmp(lm_key_expected, user_session_key, 
-                          16) != 0) {
-                       printf("NT Session Key does not match expectations (should be first-8 LM hash)!\n");
-                       printf("user_session_key:\n");
-                       dump_data(1, (const char *)user_session_key, sizeof(user_session_key));
-                       printf("expected:\n");
-                       dump_data(1, (const char *)lm_key_expected, sizeof(lm_key_expected));
-                       pass = False;
-               }
-       } else {                
-               if (memcmp(session_key.data, user_session_key, 
-                          sizeof(user_session_key)) != 0) {
-                       printf("NT Session Key does not match expectations!\n");
-                       printf("user_session_key:\n");
-                       dump_data(1, (const char *)user_session_key, 16);
-                       printf("expected:\n");
-                       dump_data(1, (const char *)session_key.data, session_key.length);
-                       pass = False;
-               }
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, 
+                                  machine_password, &creds)) {
+               return False;
        }
-        return pass;
-}
-
-/* 
- * Test LM authentication, no NT response supplied
- */
 
-static BOOL test_lm(struct samlogon_state *samlogon_state, char **error_string) 
-{
+       r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.account_name = talloc_asprintf(mem_ctx, "%s$", TEST_MACHINE_NAME);
+       r.in.secure_channel_type = SEC_CHAN_BDC;
+       r.in.computer_name = TEST_MACHINE_NAME;
 
-       return test_lm_ntlm_broken(samlogon_state, NO_NT, error_string);
-}
+       password = generate_random_str(mem_ctx, 8);
+       E_md4hash(password, r.in.new_password.hash);
 
-/* 
- * Test the NTLM response only, no LM.
- */
+       creds_des_encrypt(creds, &r.in.new_password);
 
-static BOOL test_ntlm(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lm_ntlm_broken(samlogon_state, NO_LM, error_string);
-}
+       printf("Testing ServerPasswordSet on machine account\n");
+       printf("Changing machine account password to '%s'\n", password);
 
-/* 
- * Test the NTLM response only, but in the LM field.
- */
+       creds_client_authenticator(creds, &r.in.credential);
 
-static BOOL test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       DATA_BLOB nt_response = data_blob_talloc(samlogon_state->mem_ctx, NULL, 24);
+       status = dcerpc_netr_ServerPasswordSet(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerPasswordSet - %s\n", nt_errstr(status));
+               return False;
+       }
 
-       uchar lm_key[8];
-       uchar lm_hash[16];
-       uchar user_session_key[16];
-       
-       ZERO_STRUCT(user_session_key);
+       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+               printf("Credential chaining failed\n");
+       }
 
-       SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data, nt_response.data);
+       /* by changing the machine password twice we test the
+          credentials chaining fully, and we verify that the server
+          allows the password to be set to the same value twice in a
+          row (match win2k3) */
+       printf("Testing a second ServerPasswordSet on machine account\n");
+       printf("Changing machine account password to '%s' (same as previous run)\n", password);
 
-       E_deshash(samlogon_state->password, lm_hash); 
+       creds_client_authenticator(creds, &r.in.credential);
 
-       nt_status = check_samlogon(samlogon_state,
-                                  BREAK_NONE,
-                                  &samlogon_state->chall,
-                                  &nt_response,
-                                  NULL,
-                                  lm_key, 
-                                  user_session_key,
-                                  error_string);
-       
-       if (!NT_STATUS_IS_OK(nt_status)) {
+       status = dcerpc_netr_ServerPasswordSet(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerPasswordSet (2) - %s\n", nt_errstr(status));
                return False;
        }
 
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               printf("LM Key does not match expectations!\n");
-               printf("lm_key:\n");
-               dump_data(1, (const char *)lm_key, 8);
-               printf("expected:\n");
-               dump_data(1, (const char *)lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(lm_hash, user_session_key, 8) != 0) {
-               char lm_key_expected[16];
-               memcpy(lm_key_expected, lm_hash, 8);
-               memset(lm_key_expected+8, '\0', 8);
-               if (memcmp(lm_key_expected, user_session_key, 
-                          16) != 0) {
-                       printf("NT Session Key does not match expectations (should be first-8 LM hash)!\n");
-                       printf("user_session_key:\n");
-                       dump_data(1, (const char *)user_session_key, sizeof(user_session_key));
-                       printf("expected:\n");
-                       dump_data(1, (const char *)lm_key_expected, sizeof(lm_key_expected));
-                       pass = False;
-               }
+       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+               printf("Credential chaining failed\n");
        }
-        return pass;
-}
 
-/* 
- * Test the NTLM response only, but in the both the NT and LM fields.
- */
+       machine_password = password;
 
-static BOOL test_ntlm_in_both(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       DATA_BLOB nt_response = data_blob_talloc(samlogon_state->mem_ctx, NULL, 24);
-       DATA_BLOB session_key = data_blob_talloc(samlogon_state->mem_ctx, NULL, 16);
-
-       char lm_key[8];
-       char lm_hash[16];
-       char user_session_key[16];
-       char nt_hash[16];
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(user_session_key);
-
-       SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data, 
-                    nt_response.data);
-       E_md4hash(samlogon_state->password, (unsigned char *)nt_hash);
-       SMBsesskeygen_ntv1((const unsigned char *)nt_hash, 
-                          session_key.data);
-
-       E_deshash(samlogon_state->password, (unsigned char *)lm_hash); 
-
-       nt_status = check_samlogon(samlogon_state,
-                                  BREAK_NONE,
-                                  &samlogon_state->chall,
-                                  NULL, 
-                                  &nt_response,
-                                  lm_key, 
-                                  user_session_key,
-                                  error_string);
-       
-       if (!NT_STATUS_IS_OK(nt_status)) {
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
+               printf("ServerPasswordSet failed to actually change the password\n");
                return False;
        }
 
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               printf("LM Key does not match expectations!\n");
-               printf("lm_key:\n");
-               dump_data(1, lm_key, 8);
-               printf("expected:\n");
-               dump_data(1, lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(session_key.data, user_session_key, 
-                  sizeof(user_session_key)) != 0) {
-               printf("NT Session Key does not match expectations!\n");
-               printf("user_session_key:\n");
-               dump_data(1, user_session_key, 16);
-               printf("expected:\n");
-               dump_data(1, (const char *)session_key.data, session_key.length);
-               pass = False;
-       }
-
-
-        return pass;
+       return True;
 }
 
-/* 
- * Test the NTLMv2 and LMv2 responses
- */
-
-static BOOL test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state, enum ntlm_break break_which, char **error_string) 
+/*
+  try a change password for our machine account
+*/
+static BOOL test_SetPassword2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       DATA_BLOB ntlmv2_response = data_blob(NULL, 0);
-       DATA_BLOB lmv2_response = data_blob(NULL, 0);
-       DATA_BLOB ntlmv2_session_key = data_blob(NULL, 0);
-       DATA_BLOB names_blob = NTLMv2_generate_names_blob(lp_netbios_name(), lp_workgroup());
-
-       uchar user_session_key[16];
+       NTSTATUS status;
+       struct netr_ServerPasswordSet2 r;
+       const char *password;
+       struct creds_CredentialState *creds;
+       struct samr_CryptPassword password_buf;
 
-       ZERO_STRUCT(user_session_key);
-       
-       if (!SMBNTLMv2encrypt(samlogon_state->username, lp_workgroup(), samlogon_state->password, &samlogon_state->chall,
-                             &names_blob,
-                             &lmv2_response, &ntlmv2_response, 
-                             &ntlmv2_session_key)) {
-               data_blob_free(&names_blob);
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME,
+                                  machine_password, &creds)) {
                return False;
        }
-       data_blob_free(&names_blob);
 
-       nt_status = check_samlogon(samlogon_state,
-                                  break_which,
-                                  &samlogon_state->chall,
-                                  &lmv2_response,
-                                  &ntlmv2_response,
-                                  NULL, 
-                                  user_session_key,
-                                  error_string);
-       
-       data_blob_free(&lmv2_response);
-       data_blob_free(&ntlmv2_response);
+       r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.account_name = talloc_asprintf(mem_ctx, "%s$", TEST_MACHINE_NAME);
+       r.in.secure_channel_type = SEC_CHAN_BDC;
+       r.in.computer_name = TEST_MACHINE_NAME;
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               return break_which == BREAK_NT;
-       }
+       password = generate_random_str(mem_ctx, 8);
+       encode_pw_buffer(password_buf.data, password, STR_UNICODE);
+       creds_arcfour_crypt(creds, password_buf.data, 516);
 
-       if (break_which != NO_NT && break_which != BREAK_NT && memcmp(ntlmv2_session_key.data, user_session_key, 
-                  sizeof(user_session_key)) != 0) {
-               printf("USER (NTLMv2) Session Key does not match expectations!\n");
-               printf("user_session_key:\n");
-               dump_data(1, (const char *)user_session_key, 16);
-               printf("expected:\n");
-               dump_data(1, (const char *)ntlmv2_session_key.data, ntlmv2_session_key.length);
-               pass = False;
-       }
-        return pass;
-}
+       memcpy(r.in.new_password.data, password_buf.data, 512);
+       r.in.new_password.length = IVAL(password_buf.data, 512);
 
-/* 
- * Test the NTLMv2 and LMv2 responses
- */
+       printf("Testing ServerPasswordSet2 on machine account\n");
+       printf("Changing machine account password to '%s'\n", password);
 
-static BOOL test_lmv2_ntlmv2(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lmv2_ntlmv2_broken(samlogon_state, BREAK_NONE, error_string);
-}
+       creds_client_authenticator(creds, &r.in.credential);
 
-/* 
- * Test the LMv2 response only
- */
+       status = dcerpc_netr_ServerPasswordSet2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerPasswordSet2 - %s\n", nt_errstr(status));
+               return False;
+       }
 
-static BOOL test_lmv2(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lmv2_ntlmv2_broken(samlogon_state, NO_NT, error_string);
-}
+       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+               printf("Credential chaining failed\n");
+       }
 
-/* 
- * Test the NTLMv2 response only
- */
+       machine_password = password;
 
-static BOOL test_ntlmv2(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lmv2_ntlmv2_broken(samlogon_state, NO_LM, error_string);
-}
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
+               printf("Not testing ability to set password to '', enable dangerous tests to perform this test\n");
+       } else {
+               /* by changing the machine password to ""
+                * we check if the server uses password restrictions
+                * for ServerPasswordSet2
+                * (win2k3 accepts "")
+                */
+               password = "";
+               encode_pw_buffer(password_buf.data, password, STR_UNICODE);
+               creds_arcfour_crypt(creds, password_buf.data, 516);
+               
+               memcpy(r.in.new_password.data, password_buf.data, 512);
+               r.in.new_password.length = IVAL(password_buf.data, 512);
+               
+               printf("Testing ServerPasswordSet2 on machine account\n");
+               printf("Changing machine account password to '%s'\n", password);
+               
+               creds_client_authenticator(creds, &r.in.credential);
+               
+               status = dcerpc_netr_ServerPasswordSet2(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("ServerPasswordSet2 - %s\n", nt_errstr(status));
+                       return False;
+               }
+               
+               if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+                       printf("Credential chaining failed\n");
+               }
+               
+               machine_password = password;
+       }
 
-static BOOL test_lm_ntlm(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lm_ntlm_broken(samlogon_state, BREAK_NONE, error_string);
-}
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
+               printf("ServerPasswordSet failed to actually change the password\n");
+               return False;
+       }
 
-static BOOL test_ntlm_lm_broken(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lm_ntlm_broken(samlogon_state, BREAK_LM, error_string);
-}
+       /* now try a random password */
+       password = generate_random_str(mem_ctx, 8);
+       encode_pw_buffer(password_buf.data, password, STR_UNICODE);
+       creds_arcfour_crypt(creds, password_buf.data, 516);
 
-static BOOL test_ntlm_ntlm_broken(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lm_ntlm_broken(samlogon_state, BREAK_NT, error_string);
-}
+       memcpy(r.in.new_password.data, password_buf.data, 512);
+       r.in.new_password.length = IVAL(password_buf.data, 512);
 
-static BOOL test_ntlmv2_lmv2_broken(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lmv2_ntlmv2_broken(samlogon_state, BREAK_LM, error_string);
-}
+       printf("Testing second ServerPasswordSet2 on machine account\n");
+       printf("Changing machine account password to '%s'\n", password);
 
-static BOOL test_ntlmv2_ntlmv2_broken(struct samlogon_state *samlogon_state, char **error_string) 
-{
-       return test_lmv2_ntlmv2_broken(samlogon_state, BREAK_NT, error_string);
-}
+       creds_client_authenticator(creds, &r.in.credential);
 
-static BOOL test_plaintext(struct samlogon_state *samlogon_state, enum ntlm_break break_which, char **error_string)
-{
-       NTSTATUS nt_status;
-       DATA_BLOB nt_response = data_blob(NULL, 0);
-       DATA_BLOB lm_response = data_blob(NULL, 0);
-       char *password;
-       char *dospw;
-       smb_ucs2_t *unicodepw;
-
-       uchar user_session_key[16];
-       uchar lm_key[16];
-       static const uchar zeros[8];
-       DATA_BLOB chall = data_blob_talloc(samlogon_state->mem_ctx, zeros, sizeof(zeros));
-
-       ZERO_STRUCT(user_session_key);
-       
-       if ((push_ucs2_talloc(samlogon_state->mem_ctx, (smb_ucs2_t **)&unicodepw, 
-                             samlogon_state->password)) == -1) {
-               DEBUG(0, ("push_ucs2_allocate failed!\n"));
-               exit(1);
+       status = dcerpc_netr_ServerPasswordSet2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerPasswordSet2 (2) - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+               printf("Credential chaining failed\n");
        }
 
-       nt_response = data_blob_talloc(samlogon_state->mem_ctx, unicodepw, 
-                                      strlen_w(((void *)unicodepw))*sizeof(smb_ucs2_t));
+       /* by changing the machine password twice we test the
+          credentials chaining fully, and we verify that the server
+          allows the password to be set to the same value twice in a
+          row (match win2k3) */
+       printf("Testing a second ServerPasswordSet2 on machine account\n");
+       printf("Changing machine account password to '%s' (same as previous run)\n", password);
 
-       password = strdup_upper(samlogon_state->password);
+       creds_client_authenticator(creds, &r.in.credential);
 
-       if ((convert_string_talloc(samlogon_state->mem_ctx, CH_UNIX, 
-                                  CH_DOS, password,
-                                  strlen(password)+1, 
-                                  (const void**)&dospw)) == -1) {
-               DEBUG(0, ("push_ascii_allocate failed!\n"));
-               exit(1);
+       status = dcerpc_netr_ServerPasswordSet2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerPasswordSet (3) - %s\n", nt_errstr(status));
+               return False;
        }
 
-       SAFE_FREE(password);
+       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+               printf("Credential chaining failed\n");
+       }
 
-       lm_response = data_blob_talloc(samlogon_state->mem_ctx, dospw, strlen(dospw));
+       machine_password = password;
 
-       nt_status = check_samlogon(samlogon_state,
-                                  break_which,
-                                  &chall,
-                                  &lm_response,
-                                  &nt_response,
-                                  lm_key, 
-                                  user_session_key,
-                                  error_string);
-       
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               return break_which == BREAK_NT;
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
+               printf("ServerPasswordSet failed to actually change the password\n");
+               return False;
        }
 
        return True;
 }
 
-static BOOL test_plaintext_none_broken(struct samlogon_state *samlogon_state, 
-                                      char **error_string) {
-       return test_plaintext(samlogon_state, BREAK_NONE, error_string);
-}
-
-static BOOL test_plaintext_lm_broken(struct samlogon_state *samlogon_state, 
-                                    char **error_string) {
-       return test_plaintext(samlogon_state, BREAK_LM, error_string);
-}
-
-static BOOL test_plaintext_nt_broken(struct samlogon_state *samlogon_state, 
-                                    char **error_string) {
-       return test_plaintext(samlogon_state, BREAK_NT, error_string);
-}
-
-static BOOL test_plaintext_nt_only(struct samlogon_state *samlogon_state, 
-                                  char **error_string) {
-       return test_plaintext(samlogon_state, NO_LM, error_string);
-}
-
-static BOOL test_plaintext_lm_only(struct samlogon_state *samlogon_state, 
-                                  char **error_string) {
-       return test_plaintext(samlogon_state, NO_NT, error_string);
-}
-
-/* 
-   Tests:
-   
-   - LM only
-   - NT and LM            
-   - NT
-   - NT in LM field
-   - NT in both fields
-   - NTLMv2
-   - NTLMv2 and LMv2
-   - LMv2
-   - plaintext tests (in challenge-response feilds)
-  
-   check we get the correct session key in each case
-   check what values we get for the LM session key
-   
-*/
-
-static const struct ntlm_tests {
-       BOOL (*fn)(struct samlogon_state *, char **);
-       const char *name;
-       BOOL expect_fail;
-} test_table[] = {
-       {test_lm, "LM", False},
-       {test_lm_ntlm, "LM and NTLM", False},
-       {test_ntlm, "NTLM", False},
-       {test_ntlm_in_lm, "NTLM in LM", False},
-       {test_ntlm_in_both, "NTLM in both", False},
-       {test_ntlmv2, "NTLMv2", False},
-       {test_lmv2_ntlmv2, "NTLMv2 and LMv2", False},
-       {test_lmv2, "LMv2", False},
-       {test_ntlmv2_lmv2_broken, "NTLMv2 and LMv2, LMv2 broken", False},
-       {test_ntlmv2_ntlmv2_broken, "NTLMv2 and LMv2, NTLMv2 broken", False},
-       {test_ntlm_lm_broken, "NTLM and LM, LM broken", False},
-       {test_ntlm_ntlm_broken, "NTLM and LM, NTLM broken", False},
-       {test_plaintext_none_broken, "Plaintext", True},
-       {test_plaintext_lm_broken, "Plaintext LM broken", True},
-       {test_plaintext_nt_broken, "Plaintext NT broken", True},
-       {test_plaintext_nt_only, "Plaintext NT only", True},
-       {test_plaintext_lm_only, "Plaintext LM only", True},
-       {NULL, NULL}
-};
-
 /*
   try a netlogon SamLogon
 */
-static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+BOOL test_netlogon_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                             struct cli_credentials *credentials, 
+                             struct creds_CredentialState *creds)
 {
-       int i, j;
+       NTSTATUS status;
+       struct netr_LogonSamLogon r;
+       struct netr_Authenticator auth, auth2;
+       struct netr_NetworkInfo ninfo;
+       DATA_BLOB names_blob, chal, lm_resp, nt_resp;
+       int i;
        BOOL ret = True;
-
-       struct samlogon_state samlogon_state;
-       
-       samlogon_state.mem_ctx = mem_ctx;
-       samlogon_state.username = lp_parm_string(-1, "torture", "username");
-       samlogon_state.password = lp_parm_string(-1, "torture", "password");
-       samlogon_state.p = p;
-
-       samlogon_state.chall = data_blob_talloc(mem_ctx, NULL, 8);
-
-       generate_random_buffer(samlogon_state.chall.data, 
-                              8, False);
-
-       if (!test_SetupCredentials2(p, mem_ctx, NETLOGON_NEG_AUTH2_FLAGS, &samlogon_state.creds)) {
-               return False;
+       int flags = CLI_CRED_NTLM_AUTH;
+       if (lp_client_lanman_auth()) {
+               flags |= CLI_CRED_LANMAN_AUTH;
        }
 
-       samlogon_state.r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       samlogon_state.r.in.workstation = TEST_MACHINE_NAME;
-       samlogon_state.r.in.credential = &samlogon_state.auth;
-       samlogon_state.r.in.authenticator = &samlogon_state.auth2;
+       if (lp_client_ntlmv2_auth()) {
+               flags |= CLI_CRED_NTLMv2_AUTH;
+       }
 
-       for (i=2;i<=3;i++) {
-               samlogon_state.r.in.validation_level = i;
-               for (j=0; test_table[j].fn; j++) {
-                       char *error_string = NULL;
-                       printf("Testing SamLogon with '%s' at validation level %d\n", test_table[j].name, i);
+       cli_credentials_get_ntlm_username_domain(cmdline_credentials, mem_ctx, 
+                                                &ninfo.identity_info.account_name.string,
+                                                &ninfo.identity_info.domain_name.string);
        
-                       if (!test_table[j].fn(&samlogon_state, &error_string)) {
-                               if (test_table[j].expect_fail) {
-                                       printf("Test %s failed (expected, test incomplete): %s\n", test_table[j].name, error_string);
-                               } else {
-                                       printf("Test %s failed: %s\n", test_table[j].name, error_string);
-                                       ret = False;
-                               }
-                               SAFE_FREE(error_string);
-                       }
-               }
+       generate_random_buffer(ninfo.challenge, 
+                              sizeof(ninfo.challenge));
+       chal = data_blob_const(ninfo.challenge, 
+                              sizeof(ninfo.challenge));
+
+       names_blob = NTLMv2_generate_names_blob(mem_ctx, cli_credentials_get_workstation(credentials), 
+                                               cli_credentials_get_domain(credentials));
+
+       status = cli_credentials_get_ntlm_response(cmdline_credentials, mem_ctx, 
+                                                  &flags, 
+                                                  chal,
+                                                  names_blob,
+                                                  &lm_resp, &nt_resp,
+                                                  NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_credentials_get_ntlm_response failed: %s\n", 
+                      nt_errstr(status));
+               return False;
        }
 
-       return ret;
-}
+       ninfo.lm.data = lm_resp.data;
+       ninfo.lm.length = lm_resp.length;
 
+       ninfo.nt.data = nt_resp.data;
+       ninfo.nt.length = nt_resp.length;
 
-/*
-  try a change password for our machine account
-*/
-static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
-{
-       NTSTATUS status;
-       struct netr_ServerPasswordSet r;
-       const char *password;
-       struct creds_CredentialState creds;
-
-       if (!test_SetupCredentials(p, mem_ctx, &creds)) {
-               return False;
-       }
+       ninfo.identity_info.parameter_control = 0;
+       ninfo.identity_info.logon_id_low = 0;
+       ninfo.identity_info.logon_id_high = 0;
+       ninfo.identity_info.workstation.string = cli_credentials_get_workstation(credentials);
 
        r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       r.in.username = talloc_asprintf(mem_ctx, "%s$", TEST_MACHINE_NAME);
-       r.in.secure_channel_type = SEC_CHAN_BDC;
-       r.in.computer_name = TEST_MACHINE_NAME;
+       r.in.computer_name = cli_credentials_get_workstation(credentials);
+       r.in.credential = &auth;
+       r.in.return_authenticator = &auth2;
+       r.in.logon_level = 2;
+       r.in.logon.network = &ninfo;
 
-       password = generate_random_str(8);
-       E_md4hash(password, r.in.new_password.data);
+       printf("Testing LogonSamLogon with name %s\n", ninfo.identity_info.account_name.string);
+       
+       for (i=2;i<3;i++) {
+               ZERO_STRUCT(auth2);
+               creds_client_authenticator(creds, &auth);
+               
+               r.in.validation_level = i;
+               
+               status = dcerpc_netr_LogonSamLogon(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("LogonSamLogon failed: %s\n", 
+                              nt_errstr(status));
+                       return False;
+               }
+               
+               if (!creds_client_check(creds, &r.out.return_authenticator->cred)) {
+                       printf("Credential chaining failed\n");
+                       ret = False;
+               }
+       }
 
-       creds_des_encrypt(&creds, &r.in.new_password);
+       r.in.credential = NULL;
 
-       printf("Testing ServerPasswordSet on machine account\n");
+       for (i=2;i<=3;i++) {
 
-       creds_client_authenticator(&creds, &r.in.credential);
+               r.in.validation_level = i;
 
-       status = dcerpc_netr_ServerPasswordSet(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("ServerPasswordSet - %s\n", nt_errstr(status));
-               return False;
-       }
+               printf("Testing SamLogon with validation level %d and a NULL credential\n", i);
 
-       join.machine_password = password;
+               status = dcerpc_netr_LogonSamLogon(p, mem_ctx, &r);
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+                       printf("LogonSamLogon expected INVALID_PARAMETER, got: %s\n", nt_errstr(status));
+                       ret = False;
+               }
 
-       if (!creds_client_check(&creds, &r.out.return_authenticator.cred)) {
-               printf("Credential chaining failed\n");
        }
 
-       /* by changing the machine password twice we test the credentials
-          chaining fully */
-       printf("Testing a second ServerPasswordSet on machine account\n");
 
-       creds_client_authenticator(&creds, &r.in.credential);
+       return ret;
+}
 
-       status = dcerpc_netr_ServerPasswordSet(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("ServerPasswordSet - %s\n", nt_errstr(status));
-               return False;
-       }
+/*
+  try a netlogon SamLogon
+*/
+static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                         struct cli_credentials *credentials)
+{
+       struct creds_CredentialState *creds;
 
-       if (!creds_client_check(&creds, &r.out.return_authenticator.cred)) {
-               printf("Credential chaining failed\n");
+       if (!test_SetupCredentials(p, mem_ctx, cli_credentials_get_workstation(credentials), 
+                                  cli_credentials_get_password(credentials), &creds)) {
+               return False;
        }
 
-       return True;
+       return test_netlogon_ops(p, mem_ctx, credentials, creds);
 }
 
-
 /* we remember the sequence numbers so we can easily do a DatabaseDelta */
-static struct ULONG8 sequence_nums[3];
+static uint64_t sequence_nums[3];
 
 /*
   try a netlogon DatabaseSync
@@ -1070,18 +613,18 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_DatabaseSync r;
-       struct creds_CredentialState creds;
-       const uint32 database_ids[] = {0, 1, 2}; 
+       struct creds_CredentialState *creds;
+       const uint32_t database_ids[] = {SAM_DATABASE_DOMAIN, SAM_DATABASE_BUILTIN, SAM_DATABASE_PRIVS}; 
        int i;
        BOOL ret = True;
 
-       if (!test_SetupCredentials(p, mem_ctx, &creds)) {
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
                return False;
        }
 
        r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
-       r.in.preferredmaximumlength = (uint32)-1;
+       r.in.preferredmaximumlength = (uint32_t)-1;
        ZERO_STRUCT(r.in.return_authenticator);
 
        for (i=0;i<ARRAY_SIZE(database_ids);i++) {
@@ -1091,7 +634,7 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                printf("Testing DatabaseSync of id %d\n", r.in.database_id);
 
                do {
-                       creds_client_authenticator(&creds, &r.in.credential);
+                       creds_client_authenticator(creds, &r.in.credential);
 
                        status = dcerpc_netr_DatabaseSync(p, mem_ctx, &r);
                        if (!NT_STATUS_IS_OK(status) &&
@@ -1101,7 +644,7 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                                break;
                        }
 
-                       if (!creds_client_check(&creds, &r.out.return_authenticator.cred)) {
+                       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
                                printf("Credential chaining failed\n");
                        }
 
@@ -1109,14 +652,13 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
                        if (r.out.delta_enum_array &&
                            r.out.delta_enum_array->num_deltas > 0 &&
-                           r.out.delta_enum_array->delta_enum[0].delta_type == 1 &&
+                           r.out.delta_enum_array->delta_enum[0].delta_type == NETR_DELTA_DOMAIN &&
                            r.out.delta_enum_array->delta_enum[0].delta_union.domain) {
                                sequence_nums[r.in.database_id] = 
                                        r.out.delta_enum_array->delta_enum[0].delta_union.domain->sequence_num;
-                               printf("\tsequence_nums[%d]=0x%08x%08x\n",
+                               printf("\tsequence_nums[%d]=%llu\n",
                                       r.in.database_id, 
-                                      sequence_nums[r.in.database_id].high,
-                                      sequence_nums[r.in.database_id].low);
+                                      (unsigned long long)sequence_nums[r.in.database_id]);
                        }
                } while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
        }
@@ -1132,36 +674,42 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_DatabaseDeltas r;
-       struct creds_CredentialState creds;
-       const uint32 database_ids[] = {0, 1, 2}; 
+       struct creds_CredentialState *creds;
+       const uint32_t database_ids[] = {0, 1, 2}; 
        int i;
        BOOL ret = True;
 
-       if (!test_SetupCredentials(p, mem_ctx, &creds)) {
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
                return False;
        }
 
        r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
-       r.in.preferredmaximumlength = (uint32)-1;
+       r.in.preferredmaximumlength = (uint32_t)-1;
        ZERO_STRUCT(r.in.return_authenticator);
 
        for (i=0;i<ARRAY_SIZE(database_ids);i++) {
                r.in.database_id = database_ids[i];
                r.in.sequence_num = sequence_nums[r.in.database_id];
 
-               if (r.in.sequence_num.low == 0) continue;
+               if (r.in.sequence_num == 0) continue;
 
-               r.in.sequence_num.low -= 1;
+               r.in.sequence_num -= 1;
 
 
-               printf("Testing DatabaseDeltas of id %d at %d\n", 
-                      r.in.database_id, r.in.sequence_num.low);
+               printf("Testing DatabaseDeltas of id %d at %llu\n", 
+                      r.in.database_id, (unsigned long long)r.in.sequence_num);
 
                do {
-                       creds_client_authenticator(&creds, &r.in.credential);
+                       creds_client_authenticator(creds, &r.in.credential);
 
                        status = dcerpc_netr_DatabaseDeltas(p, mem_ctx, &r);
+                       if (NT_STATUS_EQUAL(status, 
+                                            NT_STATUS_SYNCHRONIZATION_REQUIRED)) {
+                               printf("no considering %s to be an error\n",
+                                      nt_errstr(status));
+                               return True;
+                       }
                        if (!NT_STATUS_IS_OK(status) &&
                            !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
                                printf("DatabaseDeltas - %s\n", nt_errstr(status));
@@ -1169,12 +717,11 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                                break;
                        }
 
-                       if (!creds_client_check(&creds, &r.out.return_authenticator.cred)) {
+                       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
                                printf("Credential chaining failed\n");
                        }
 
-                       r.in.sequence_num.low++;
-                       r.in.sequence_num.high = 0;
+                       r.in.sequence_num++;
                } while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
        }
 
@@ -1189,17 +736,17 @@ static BOOL test_AccountDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_AccountDeltas r;
-       struct creds_CredentialState creds;
+       struct creds_CredentialState *creds;
        BOOL ret = True;
 
-       if (!test_SetupCredentials(p, mem_ctx, &creds)) {
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
                return False;
        }
 
        r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
        ZERO_STRUCT(r.in.return_authenticator);
-       creds_client_authenticator(&creds, &r.in.credential);
+       creds_client_authenticator(creds, &r.in.credential);
        ZERO_STRUCT(r.in.uas);
        r.in.count=10;
        r.in.level=0;
@@ -1224,17 +771,17 @@ static BOOL test_AccountSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_AccountSync r;
-       struct creds_CredentialState creds;
+       struct creds_CredentialState *creds;
        BOOL ret = True;
 
-       if (!test_SetupCredentials(p, mem_ctx, &creds)) {
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
                return False;
        }
 
        r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
        ZERO_STRUCT(r.in.return_authenticator);
-       creds_client_authenticator(&creds, &r.in.credential);
+       creds_client_authenticator(creds, &r.in.credential);
        ZERO_STRUCT(r.in.recordid);
        r.in.reference=0;
        r.in.level=0;
@@ -1418,18 +965,20 @@ static BOOL test_DatabaseSync2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_DatabaseSync2 r;
-       struct creds_CredentialState creds;
-       const uint32 database_ids[] = {0, 1, 2}; 
+       struct creds_CredentialState *creds;
+       const uint32_t database_ids[] = {0, 1, 2}; 
        int i;
        BOOL ret = True;
 
-       if (!test_SetupCredentials2(p, mem_ctx, NETLOGON_NEG_AUTH2_FLAGS, &creds)) {
+       if (!test_SetupCredentials2(p, mem_ctx, NETLOGON_NEG_AUTH2_FLAGS, 
+                                   TEST_MACHINE_NAME, machine_password, 
+                                   SEC_CHAN_BDC, &creds)) {
                return False;
        }
 
        r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
-       r.in.preferredmaximumlength = (uint32)-1;
+       r.in.preferredmaximumlength = (uint32_t)-1;
        ZERO_STRUCT(r.in.return_authenticator);
 
        for (i=0;i<ARRAY_SIZE(database_ids);i++) {
@@ -1440,7 +989,7 @@ static BOOL test_DatabaseSync2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                printf("Testing DatabaseSync2 of id %d\n", r.in.database_id);
 
                do {
-                       creds_client_authenticator(&creds, &r.in.credential);
+                       creds_client_authenticator(creds, &r.in.credential);
 
                        status = dcerpc_netr_DatabaseSync2(p, mem_ctx, &r);
                        if (!NT_STATUS_IS_OK(status) &&
@@ -1450,7 +999,7 @@ static BOOL test_DatabaseSync2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                                break;
                        }
 
-                       if (!creds_client_check(&creds, &r.out.return_authenticator.cred)) {
+                       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
                                printf("Credential chaining failed\n");
                        }
 
@@ -1542,91 +1091,467 @@ static BOOL test_LogonControl2Ex(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
+/*
+  try a netlogon netr_DsrEnumerateDomainTrusts
+*/
+static BOOL test_DsrEnumerateDomainTrusts(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_DsrEnumerateDomainTrusts r;
+
+       r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.trust_flags = 0x3f;
+
+       printf("Testing netr_DsrEnumerateDomainTrusts\n");
+
+       status = dcerpc_netr_DsrEnumerateDomainTrusts(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
+               printf("netr_DsrEnumerateDomainTrusts - %s/%s\n", 
+                      nt_errstr(status), win_errstr(r.out.result));
+               return False;
+       }
+
+       return True;
+}
 
-BOOL torture_rpc_netlogon(int dummy)
+static BOOL test_netr_DsRGetSiteName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                    const char *computer_name, 
+                                    const char *expected_site) 
 {
-        NTSTATUS status;
-        struct dcerpc_pipe *p;
-       TALLOC_CTX *mem_ctx;
+       NTSTATUS status;
+       struct netr_DsRGetSiteName r;
        BOOL ret = True;
 
-       mem_ctx = talloc_init("torture_rpc_netlogon");
+       r.in.computer_name              = computer_name;
+       printf("Testing netr_DsRGetSiteName\n");
 
-       if (!join_domain_bdc(mem_ctx)) {
-               printf("Failed to join as BDC\n");
-               return False;
+       status = dcerpc_netr_DsRGetSiteName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
+               printf("netr_DsRGetSiteName - %s/%s\n", 
+                      nt_errstr(status), win_errstr(r.out.result));
+               ret = False;
+       } else {
+               if (strcmp(expected_site, r.out.site) != 0) {
+                       printf("netr_DsRGetSiteName - unexpected result: %s, expected %s\n", 
+                              r.out.site, expected_site);
+                                       
+                       ret = False;
+               }
        }
+       r.in.computer_name              = talloc_asprintf(mem_ctx, "\\\\%s", computer_name);
+       printf("Testing netr_DsRGetSiteName with broken computer name: %s\n", r.in.computer_name);
 
-       status = torture_rpc_connection(&p, 
-                                       DCERPC_NETLOGON_NAME,
-                                       DCERPC_NETLOGON_UUID,
-                                       DCERPC_NETLOGON_VERSION);
+       status = dcerpc_netr_DsRGetSiteName(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               return False;
+               printf("netr_DsRGetSiteName - %s\n", 
+                      nt_errstr(status));
+               ret = False;
+       } else if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_COMPUTERNAME)) {
+               printf("netr_DsRGetSiteName - incorrect error return %s, expected %s\n", 
+                      win_errstr(r.out.result), win_errstr(WERR_INVALID_COMPUTERNAME));
+               ret = False;
        }
+       return ret;
+}
+
+/*
+  try a netlogon netr_DsRGetDCName
+*/
+static BOOL test_netr_DsRGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_DsRGetDCName r;
+       BOOL ret = True;
+
+       r.in.server_unc         = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.domain_name        = talloc_asprintf(mem_ctx, "%s", lp_realm());
+       r.in.domain_guid        = NULL;
+       r.in.site_guid          = NULL;
+       r.in.flags              = 0x40000000;
 
-       if (!test_LogonUasLogon(p, mem_ctx)) {
+       printf("Testing netr_DsRGetDCName\n");
+
+       status = dcerpc_netr_DsRGetDCName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
+               printf("netr_DsRGetDCName - %s/%s\n", 
+                      nt_errstr(status), win_errstr(r.out.result));
                ret = False;
+       } else {
+               ret = test_netr_DsRGetSiteName(p, mem_ctx, 
+                                              r.out.info->dc_unc, 
+                                              r.out.info->dc_site_name);
        }
 
-       if (!test_LogonUasLogoff(p, mem_ctx)) {
+       return ret;
+}
+
+/*
+  try a netlogon netr_DsRGetDCNameEx
+*/
+static BOOL test_netr_DsRGetDCNameEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_DsRGetDCNameEx r;
+       BOOL ret = True;
+
+       r.in.server_unc         = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.domain_name        = talloc_asprintf(mem_ctx, "%s", lp_realm());
+       r.in.domain_guid        = NULL;
+       r.in.site_name          = NULL;
+       r.in.flags              = 0x40000000;
+
+       printf("Testing netr_DsRGetDCNameEx\n");
+
+       status = dcerpc_netr_DsRGetDCNameEx(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
+               printf("netr_DsRGetDCNameEx - %s/%s\n", 
+                      nt_errstr(status), win_errstr(r.out.result));
                ret = False;
+       } else {
+               ret = test_netr_DsRGetSiteName(p, mem_ctx, 
+                                              r.out.info->dc_unc, 
+                                              r.out.info->dc_site_name);
        }
 
-       if (!test_SetPassword(p, mem_ctx)) {
+       return ret;
+}
+
+/*
+  try a netlogon netr_DsRGetDCNameEx2
+*/
+static BOOL test_netr_DsRGetDCNameEx2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_DsRGetDCNameEx2 r;
+       BOOL ret = True;
+
+       r.in.server_unc         = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.client_account     = NULL;
+       r.in.mask               = 0x00000000;
+       r.in.domain_name        = talloc_asprintf(mem_ctx, "%s", lp_realm());
+       r.in.domain_guid        = NULL;
+       r.in.site_name          = NULL;
+       r.in.flags              = 0x40000000;
+
+       printf("Testing netr_DsRGetDCNameEx2 without client account\n");
+
+       status = dcerpc_netr_DsRGetDCNameEx2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
+               printf("netr_DsRGetDCNameEx2 - %s/%s\n", 
+                      nt_errstr(status), win_errstr(r.out.result));
                ret = False;
        }
 
-       if (!test_SamLogon(p, mem_ctx)) {
+       printf("Testing netr_DsRGetDCNameEx2 with client acount\n");
+       r.in.client_account     = TEST_MACHINE_NAME"$";
+       r.in.mask               = 0x00002000;
+       r.in.flags              = 0x80000000;
+
+       status = dcerpc_netr_DsRGetDCNameEx2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
+               printf("netr_DsRGetDCNameEx2 - %s/%s\n", 
+                      nt_errstr(status), win_errstr(r.out.result));
                ret = False;
+       } else {
+               ret = test_netr_DsRGetSiteName(p, mem_ctx, 
+                                              r.out.info->dc_unc, 
+                                              r.out.info->dc_site_name);
        }
 
-       if (!test_DatabaseSync(p, mem_ctx)) {
-               ret = False;
+       return ret;
+}
+
+static BOOL test_GetDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_LogonGetDomainInfo r;
+       struct netr_DomainQuery1 q1;
+       struct netr_Authenticator a;
+       struct creds_CredentialState *creds;
+
+       if (!test_SetupCredentials3(p, mem_ctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
+                                   TEST_MACHINE_NAME, machine_password, &creds)) {
+               return False;
        }
 
-       if (!test_DatabaseDeltas(p, mem_ctx)) {
-               ret = False;
+       ZERO_STRUCT(r);
+
+       creds_client_authenticator(creds, &a);
+
+       r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.computer_name = TEST_MACHINE_NAME;
+       r.in.level = 1;
+       r.in.credential = &a;
+       r.in.return_authenticator = &a;
+       r.out.return_authenticator = &a;
+
+       r.in.query.query1 = &q1;
+       ZERO_STRUCT(q1);
+       
+       /* this should really be the fully qualified name */
+       q1.workstation_domain = TEST_MACHINE_NAME;
+       q1.workstation_site = "Default-First-Site-Name";
+       q1.blob2.length = 0;
+       q1.blob2.size = 0;
+       q1.blob2.data = NULL;
+       q1.product.string = "product string";
+
+       printf("Testing netr_LogonGetDomainInfo\n");
+
+       status = dcerpc_netr_LogonGetDomainInfo(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("netr_LogonGetDomainInfo - %s\n", nt_errstr(status));
+               return False;
        }
 
-       if (!test_AccountDeltas(p, mem_ctx)) {
-               ret = False;
+       if (!creds_client_check(creds, &a.cred)) {
+               printf("Credential chaining failed\n");
+               return False;
        }
 
-       if (!test_AccountSync(p, mem_ctx)) {
-               ret = False;
+       return True;
+}
+
+
+static void async_callback(struct rpc_request *req)
+{
+       int *counter = req->async.private;
+       if (NT_STATUS_IS_OK(req->status)) {
+               (*counter)++;
        }
+}
 
-       if (!test_GetDcName(p, mem_ctx)) {
-               ret = False;
+static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_LogonGetDomainInfo r;
+       struct netr_DomainQuery1 q1;
+       struct netr_Authenticator a;
+#define ASYNC_COUNT 100
+       struct creds_CredentialState *creds;
+       struct creds_CredentialState *creds_async[ASYNC_COUNT];
+       struct rpc_request *req[ASYNC_COUNT];
+       int i;
+       int *async_counter = talloc(mem_ctx, int);
+
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
+               printf("test_GetDomainInfo_async disabled - enable dangerous tests to use\n");
+               return True;
        }
 
-       if (!test_LogonControl(p, mem_ctx)) {
-               ret = False;
+       if (!test_SetupCredentials3(p, mem_ctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
+                                   TEST_MACHINE_NAME, machine_password, &creds)) {
+               return False;
        }
 
-       if (!test_GetAnyDCName(p, mem_ctx)) {
-               ret = False;
+       ZERO_STRUCT(r);
+       r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.computer_name = TEST_MACHINE_NAME;
+       r.in.level = 1;
+       r.in.credential = &a;
+       r.in.return_authenticator = &a;
+       r.out.return_authenticator = &a;
+
+       r.in.query.query1 = &q1;
+       ZERO_STRUCT(q1);
+       
+       /* this should really be the fully qualified name */
+       q1.workstation_domain = TEST_MACHINE_NAME;
+       q1.workstation_site = "Default-First-Site-Name";
+       q1.blob2.length = 0;
+       q1.blob2.size = 0;
+       q1.blob2.data = NULL;
+       q1.product.string = "product string";
+
+       printf("Testing netr_LogonGetDomainInfo - async count %d\n", ASYNC_COUNT);
+
+       *async_counter = 0;
+
+       for (i=0;i<ASYNC_COUNT;i++) {
+               creds_client_authenticator(creds, &a);
+
+               creds_async[i] = talloc_memdup(creds, creds, sizeof(*creds));
+               req[i] = dcerpc_netr_LogonGetDomainInfo_send(p, mem_ctx, &r);
+
+               req[i]->async.callback = async_callback;
+               req[i]->async.private = async_counter;
+
+               /* even with this flush per request a w2k3 server seems to 
+                  clag with multiple outstanding requests. bleergh. */
+               if (event_loop_once(dcerpc_event_context(p)) != 0) {
+                       return False;
+               }
        }
 
-       if (!test_LogonControl2(p, mem_ctx)) {
-               ret = False;
+       for (i=0;i<ASYNC_COUNT;i++) {
+               status = dcerpc_ndr_request_recv(req[i]);
+               if (!NT_STATUS_IS_OK(status) || !NT_STATUS_IS_OK(r.out.result)) {
+                       printf("netr_LogonGetDomainInfo_async(%d) - %s/%s\n", 
+                              i, nt_errstr(status), nt_errstr(r.out.result));
+                       break;
+               }
+
+               if (!creds_client_check(creds_async[i], &a.cred)) {
+                       printf("Credential chaining failed at async %d\n", i);
+                       break;
+               }
        }
 
-       if (!test_DatabaseSync2(p, mem_ctx)) {
-               ret = False;
+       printf("Testing netr_LogonGetDomainInfo - async count %d OK\n", *async_counter);
+
+       return (*async_counter) == ASYNC_COUNT;
+}
+
+static BOOL test_ManyGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct dcerpc_pipe *p2;
+       struct lsa_ObjectAttribute attr;
+       struct lsa_QosInfo qos;
+       struct lsa_OpenPolicy2 o;
+       struct policy_handle lsa_handle;
+       struct lsa_DomainList domains;
+
+       struct lsa_EnumTrustDom t;
+       uint32_t resume_handle = 0;
+       struct netr_GetAnyDCName d;
+
+       int i;
+       BOOL ret = True;
+
+       if (p->conn->transport.transport != NCACN_NP) {
+               return True;
        }
 
-       if (!test_LogonControl2Ex(p, mem_ctx)) {
-               ret = False;
+       printf("Torturing GetDCName\n");
+
+       status = dcerpc_secondary_connection(p, &p2, p->binding);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to create secondary connection\n");
+               return False;
+       }
+
+       status = dcerpc_bind_auth_none(p2, &dcerpc_table_lsarpc);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to create bind on secondary connection\n");
+               return False;
+        }
+
+       qos.len = 0;
+       qos.impersonation_level = 2;
+       qos.context_mode = 1;
+       qos.effective_only = 0;
+
+       attr.len = 0;
+       attr.root_dir = NULL;
+       attr.object_name = NULL;
+       attr.attributes = 0;
+       attr.sec_desc = NULL;
+       attr.sec_qos = &qos;
+
+       o.in.system_name = "\\";
+       o.in.attr = &attr;
+       o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       o.out.handle = &lsa_handle;
+
+       status = dcerpc_lsa_OpenPolicy2(p2, mem_ctx, &o);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("OpenPolicy2 failed - %s\n", nt_errstr(status));
+               return False;
        }
 
-        torture_rpc_close(p);
+       t.in.handle = &lsa_handle;
+       t.in.resume_handle = &resume_handle;
+       t.in.max_size = 1000;
+       t.out.domains = &domains;
+       t.out.resume_handle = &resume_handle;
 
-       if (!leave_domain_bdc(mem_ctx)) {
-               printf("Failed to delete BDC machine account\n");
+       status = dcerpc_lsa_EnumTrustDom(p2, mem_ctx, &t);
+
+       if ((!NT_STATUS_IS_OK(status) &&
+            (!NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)))) {
+               printf("Could not list domains\n");
+               return False;
+       }
+
+       talloc_free(p2);
+
+       d.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s",
+                                           dcerpc_server_name(p));
+
+       for (i=0; i<domains.count * 4; i++) {
+               struct lsa_DomainInformation *info =
+                       &domains.domains[rand()%domains.count];
+
+               d.in.domainname = info->name.string;
+
+               status = dcerpc_netr_GetAnyDCName(p, mem_ctx, &d);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("GetAnyDCName - %s\n", nt_errstr(status));
+                       continue;
+               }
+
+               printf("\tDC for domain %s is %s\n", info->name.string,
+                      d.out.dcname ? d.out.dcname : "unknown");
+       }
+
+       return ret;
+}
+
+
+BOOL torture_rpc_netlogon(void)
+{
+        NTSTATUS status;
+        struct dcerpc_pipe *p;
+       TALLOC_CTX *mem_ctx;
+       BOOL ret = True;
+       struct test_join *join_ctx;
+       struct cli_credentials *machine_credentials;
+
+       mem_ctx = talloc_init("torture_rpc_netlogon");
+
+       join_ctx = torture_join_domain(TEST_MACHINE_NAME, ACB_SVRTRUST, 
+                                      &machine_credentials);
+       if (!join_ctx) {
+               talloc_free(mem_ctx);
+               printf("Failed to join as BDC\n");
+               return False;
+       }
+
+       machine_password = cli_credentials_get_password(machine_credentials);
+
+       status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_netlogon);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(mem_ctx);
                return False;
        }
 
+       ret &= test_LogonUasLogon(p, mem_ctx);
+       ret &= test_LogonUasLogoff(p, mem_ctx);
+       ret &= test_SamLogon(p, mem_ctx, machine_credentials);
+       ret &= test_SetPassword(p, mem_ctx);
+       ret &= test_SetPassword2(p, mem_ctx);
+       ret &= test_GetDomainInfo(p, mem_ctx);
+       ret &= test_DatabaseSync(p, mem_ctx);
+       ret &= test_DatabaseDeltas(p, mem_ctx);
+       ret &= test_AccountDeltas(p, mem_ctx);
+       ret &= test_AccountSync(p, mem_ctx);
+       ret &= test_GetDcName(p, mem_ctx);
+       ret &= test_ManyGetDCName(p, mem_ctx);
+       ret &= test_LogonControl(p, mem_ctx);
+       ret &= test_GetAnyDCName(p, mem_ctx);
+       ret &= test_LogonControl2(p, mem_ctx);
+       ret &= test_DatabaseSync2(p, mem_ctx);
+       ret &= test_LogonControl2Ex(p, mem_ctx);
+       ret &= test_DsrEnumerateDomainTrusts(p, mem_ctx);
+       ret &= test_GetDomainInfo_async(p, mem_ctx);
+       ret &= test_netr_DsRGetDCName(p, mem_ctx);
+       ret &= test_netr_DsRGetDCNameEx(p, mem_ctx);
+       ret &= test_netr_DsRGetDCNameEx2(p, mem_ctx);
+
+       talloc_free(mem_ctx);
+
+       torture_leave_domain(join_ctx);
+
        return ret;
 }