r14720: Add torture_context argument to all torture tests
[kamenim/samba.git] / source4 / torture / rpc / netlogon.c
index 67e0bc9393e5336983306c6e617f9bb3b78ede58..b66ea719cc6612409a3d91b919566f24685b1b28 100644 (file)
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_netlogon.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/rpc.h"
+#include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 static const char *machine_password;
 
@@ -36,7 +43,7 @@ static BOOL test_LogonUasLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct netr_LogonUasLogon r;
 
        r.in.server_name = NULL;
-       r.in.account_name = 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");
@@ -57,7 +64,7 @@ static BOOL test_LogonUasLogoff(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct netr_LogonUasLogoff r;
 
        r.in.server_name = NULL;
-       r.in.account_name = 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");
@@ -72,19 +79,25 @@ static BOOL test_LogonUasLogoff(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        
 }
 
-BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                           const char *machine_name,
                           const char *plain_pass,
-                          struct creds_CredentialState *creds)
+                          struct creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate a;
        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 = machine_name;
        r.in.credentials = &credentials1;
@@ -107,7 +120,8 @@ BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        a.in.credentials = &credentials3;
        a.out.credentials = &credentials3;
 
-       creds_client_init(creds, &credentials1, &credentials2, &mach_password, &credentials3, 
+       creds_client_init(creds, &credentials1, &credentials2, 
+                         &mach_password, &credentials3, 
                          0);
 
        printf("Testing ServerAuthenticate\n");
@@ -123,24 +137,31 @@ BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
+       *creds_out = creds;
        return True;
 }
 
-BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                            uint32_t negotiate_flags,
                            const char *machine_name,
                            const char *plain_pass,
                            int sec_chan_type,
-                           struct creds_CredentialState *creds)
+                           struct creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate2 a;
        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 = machine_name;
        r.in.credentials = &credentials1;
@@ -165,7 +186,8 @@ BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        a.in.credentials = &credentials3;
        a.out.credentials = &credentials3;
 
-       creds_client_init(creds, &credentials1, &credentials2, &mach_password, &credentials3, 
+       creds_client_init(creds, &credentials1, &credentials2, 
+                         &mach_password, &credentials3, 
                          negotiate_flags);
 
        printf("Testing ServerAuthenticate2\n");
@@ -183,25 +205,32 @@ BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        printf("negotiate_flags=0x%08x\n", negotiate_flags);
 
+       *creds_out = creds;
        return True;
 }
 
 
-BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+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)
+                           struct creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate3 a;
        struct netr_Credential credentials1, credentials2, credentials3;
+       struct creds_CredentialState *creds;
        struct samr_Password mach_password;
-       uint32 rid;
+       uint32_t rid;
 
        printf("Testing ServerReqChallenge\n");
 
+       creds = talloc(mem_ctx, struct creds_CredentialState);
+       if (!creds) {
+               return False;
+       }
+
        r.in.server_name = NULL;
        r.in.computer_name = machine_name;
        r.in.credentials = &credentials1;
@@ -227,7 +256,8 @@ BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        a.out.negotiate_flags = &negotiate_flags;
        a.out.rid = &rid;
 
-       creds_client_init(creds, &credentials1, &credentials2, &mach_password, &credentials3,
+       creds_client_init(creds, &credentials1, &credentials2, 
+                         &mach_password, &credentials3,
                          negotiate_flags);
 
        printf("Testing ServerAuthenticate3\n");
@@ -245,6 +275,7 @@ BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        printf("negotiate_flags=0x%08x\n", negotiate_flags);
 
+       *creds_out = creds;
        return True;
 }
 
@@ -256,7 +287,7 @@ 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;
+       struct creds_CredentialState *creds;
 
        if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, 
                                   machine_password, &creds)) {
@@ -271,12 +302,12 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        password = generate_random_str(mem_ctx, 8);
        E_md4hash(password, r.in.new_password.hash);
 
-       creds_des_encrypt(&creds, &r.in.new_password);
+       creds_des_encrypt(creds, &r.in.new_password);
 
        printf("Testing ServerPasswordSet on machine account\n");
        printf("Changing machine account password to '%s'\n", password);
 
-       creds_client_authenticator(&creds, &r.in.credential);
+       creds_client_authenticator(creds, &r.in.credential);
 
        status = dcerpc_netr_ServerPasswordSet(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -284,7 +315,7 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                return False;
        }
 
-       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");
        }
 
@@ -295,7 +326,7 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        printf("Testing a second ServerPasswordSet on machine account\n");
        printf("Changing machine account password to '%s' (same as previous run)\n", password);
 
-       creds_client_authenticator(&creds, &r.in.credential);
+       creds_client_authenticator(creds, &r.in.credential);
 
        status = dcerpc_netr_ServerPasswordSet(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -303,7 +334,142 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                return False;
        }
 
-       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");
+       }
+
+       machine_password = password;
+
+       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;
+}
+
+/*
+  try a change password for our machine account
+*/
+static BOOL test_SetPassword2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+{
+       NTSTATUS status;
+       struct netr_ServerPasswordSet2 r;
+       const char *password;
+       struct creds_CredentialState *creds;
+       struct samr_CryptPassword password_buf;
+
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME,
+                                  machine_password, &creds)) {
+               return False;
+       }
+
+       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;
+
+       password = generate_random_str(mem_ctx, 8);
+       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;
+
+       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;
+       }
+
+       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, machine_password, &creds)) {
+               printf("ServerPasswordSet failed to actually change the password\n");
+               return False;
+       }
+
+       /* 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);
+
+       memcpy(r.in.new_password.data, password_buf.data, 512);
+       r.in.new_password.length = IVAL(password_buf.data, 512);
+
+       printf("Testing second 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 (2) - %s\n", nt_errstr(status));
+               return 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, 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);
+
+       creds_client_authenticator(creds, &r.in.credential);
+
+       status = dcerpc_netr_ServerPasswordSet2(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerPasswordSet (3) - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
                printf("Credential chaining failed\n");
        }
 
@@ -320,62 +486,86 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 /*
   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)
 {
        NTSTATUS status;
        struct netr_LogonSamLogon r;
        struct netr_Authenticator auth, auth2;
        struct netr_NetworkInfo ninfo;
-       const char *username = lp_parm_string(-1, "torture", "username");
-       const char *password = lp_parm_string(-1, "torture", "password");
-       struct creds_CredentialState creds;
-
+       DATA_BLOB names_blob, chal, lm_resp, nt_resp;
        int i;
        BOOL ret = True;
+       int flags = CLI_CRED_NTLM_AUTH;
+       if (lp_client_lanman_auth()) {
+               flags |= CLI_CRED_LANMAN_AUTH;
+       }
 
-       if (!test_SetupCredentials(p, mem_ctx, TEST_MACHINE_NAME, 
-                                  machine_password, &creds)) {
+       if (lp_client_ntlmv2_auth()) {
+               flags |= CLI_CRED_NTLMv2_AUTH;
+       }
+
+       cli_credentials_get_ntlm_username_domain(cmdline_credentials, mem_ctx, 
+                                                &ninfo.identity_info.account_name.string,
+                                                &ninfo.identity_info.domain_name.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;
        }
 
-       ninfo.identity_info.domain_name.string = lp_workgroup();
+       ninfo.lm.data = lm_resp.data;
+       ninfo.lm.length = lm_resp.length;
+
+       ninfo.nt.data = nt_resp.data;
+       ninfo.nt.length = nt_resp.length;
+
        ninfo.identity_info.parameter_control = 0;
        ninfo.identity_info.logon_id_low = 0;
        ninfo.identity_info.logon_id_high = 0;
-       ninfo.identity_info.account_name.string = username;
-       ninfo.identity_info.workstation.string = TEST_MACHINE_NAME;
-       generate_random_buffer(ninfo.challenge, 
-                              sizeof(ninfo.challenge));
-       ninfo.nt.length = 24;
-       ninfo.nt.data = talloc_size(mem_ctx, 24);
-       SMBNTencrypt(password, ninfo.challenge, ninfo.nt.data);
-       ninfo.lm.length = 24;
-       ninfo.lm.data = talloc_size(mem_ctx, 24);
-       SMBencrypt(password, ninfo.challenge, ninfo.lm.data);
+       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.workstation = 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;
 
-       for (i=2;i<=3;i++) {
+       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);
-
+               creds_client_authenticator(creds, &auth);
+               
                r.in.validation_level = i;
-
-               printf("Testing SamLogon with validation level %d\n", i);
-
+               
                status = dcerpc_netr_LogonSamLogon(p, mem_ctx, &r);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("LogonSamLogon - %s\n", nt_errstr(status));
-                       ret = False;
+                       printf("LogonSamLogon failed: %s\n", 
+                              nt_errstr(status));
+                       return False;
                }
-
-               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");
+                       ret = False;
                }
        }
 
@@ -385,7 +575,7 @@ static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
                r.in.validation_level = i;
 
-               printf("Testing SamLogon with validation level %d\n", i);
+               printf("Testing SamLogon with validation level %d and a NULL credential\n", i);
 
                status = dcerpc_netr_LogonSamLogon(p, mem_ctx, &r);
                if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
@@ -395,10 +585,25 @@ static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        }
 
+
        return ret;
 }
 
+/*
+  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 (!test_SetupCredentials(p, mem_ctx, cli_credentials_get_workstation(credentials), 
+                                  cli_credentials_get_password(credentials), &creds)) {
+               return False;
+       }
 
+       return test_netlogon_ops(p, mem_ctx, credentials, creds);
+}
 
 /* we remember the sequence numbers so we can easily do a DatabaseDelta */
 static uint64_t sequence_nums[3];
@@ -410,7 +615,7 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_DatabaseSync r;
-       struct creds_CredentialState creds;
+       struct creds_CredentialState *creds;
        const uint32_t database_ids[] = {SAM_DATABASE_DOMAIN, SAM_DATABASE_BUILTIN, SAM_DATABASE_PRIVS}; 
        int i;
        BOOL ret = True;
@@ -431,7 +636,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) &&
@@ -441,7 +646,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");
                        }
 
@@ -455,7 +660,7 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                                        r.out.delta_enum_array->delta_enum[0].delta_union.domain->sequence_num;
                                printf("\tsequence_nums[%d]=%llu\n",
                                       r.in.database_id, 
-                                      sequence_nums[r.in.database_id]);
+                                      (unsigned long long)sequence_nums[r.in.database_id]);
                        }
                } while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
        }
@@ -471,7 +676,7 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_DatabaseDeltas r;
-       struct creds_CredentialState creds;
+       struct creds_CredentialState *creds;
        const uint32_t database_ids[] = {0, 1, 2}; 
        int i;
        BOOL ret = True;
@@ -495,12 +700,18 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 
                printf("Testing DatabaseDeltas of id %d at %llu\n", 
-                      r.in.database_id, r.in.sequence_num);
+                      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));
@@ -508,7 +719,7 @@ 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");
                        }
 
@@ -527,7 +738,7 @@ 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, TEST_MACHINE_NAME, machine_password, &creds)) {
@@ -537,7 +748,7 @@ static BOOL test_AccountDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        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;
@@ -562,7 +773,7 @@ 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, TEST_MACHINE_NAME, machine_password, &creds)) {
@@ -572,7 +783,7 @@ static BOOL test_AccountSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        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;
@@ -756,7 +967,7 @@ static BOOL test_DatabaseSync2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct netr_DatabaseSync2 r;
-       struct creds_CredentialState creds;
+       struct creds_CredentialState *creds;
        const uint32_t database_ids[] = {0, 1, 2}; 
        int i;
        BOOL ret = True;
@@ -780,7 +991,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) &&
@@ -790,7 +1001,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");
                        }
 
@@ -905,13 +1116,115 @@ static BOOL test_DsrEnumerateDomainTrusts(struct dcerpc_pipe *p, TALLOC_CTX *mem
        return True;
 }
 
+static BOOL test_netr_DsRGetSiteName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                    const char *computer_name, 
+                                    const char *expected_site) 
+{
+       NTSTATUS status;
+       struct netr_DsRGetSiteName r;
+       BOOL ret = True;
+
+       r.in.computer_name              = computer_name;
+       printf("Testing netr_DsRGetSiteName\n");
+
+       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 = dcerpc_netr_DsRGetSiteName(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               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;
+
+       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);
+       }
+
+       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);
+       }
+
+       return ret;
+}
+
 /*
-  try a netlogon netr_DrsGetDCNameEx2
+  try a netlogon netr_DsRGetDCNameEx2
 */
-static BOOL test_netr_DrsGetDCNameEx2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static BOOL test_netr_DsRGetDCNameEx2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
-       struct netr_DrsGetDCNameEx2 r;
+       struct netr_DsRGetDCNameEx2 r;
        BOOL ret = True;
 
        r.in.server_unc         = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
@@ -922,25 +1235,29 @@ static BOOL test_netr_DrsGetDCNameEx2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx
        r.in.site_name          = NULL;
        r.in.flags              = 0x40000000;
 
-       printf("Testing netr_DrsGetDCNameEx2 without client account\n");
+       printf("Testing netr_DsRGetDCNameEx2 without client account\n");
 
-       status = dcerpc_netr_DrsGetDCNameEx2(p, mem_ctx, &r);
+       status = dcerpc_netr_DsRGetDCNameEx2(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
-               printf("netr_DrsGetDCNameEx2 - %s/%s\n", 
+               printf("netr_DsRGetDCNameEx2 - %s/%s\n", 
                       nt_errstr(status), win_errstr(r.out.result));
                ret = False;
        }
 
-       printf("Testing netr_DrsGetDCNameEx2 with client acount\n");
+       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_DrsGetDCNameEx2(p, mem_ctx, &r);
+       status = dcerpc_netr_DsRGetDCNameEx2(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
-               printf("netr_DrsGetDCNameEx2 - %s/%s\n", 
+               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);
        }
 
        return ret;
@@ -952,7 +1269,7 @@ static BOOL test_GetDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct netr_LogonGetDomainInfo r;
        struct netr_DomainQuery1 q1;
        struct netr_Authenticator a;
-       struct creds_CredentialState creds;
+       struct creds_CredentialState *creds;
 
        if (!test_SetupCredentials3(p, mem_ctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
                                    TEST_MACHINE_NAME, machine_password, &creds)) {
@@ -961,17 +1278,14 @@ static BOOL test_GetDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        ZERO_STRUCT(r);
 
-       creds_client_authenticator(&creds, &a);
+       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.unknown1 = 512;
        r.in.level = 1;
        r.in.credential = &a;
-       r.out.credential = &a;
-
-       r.in.i1[0] = 0;
-       r.in.i1[1] = 0;
+       r.in.return_authenticator = &a;
+       r.out.return_authenticator = &a;
 
        r.in.query.query1 = &q1;
        ZERO_STRUCT(q1);
@@ -992,7 +1306,7 @@ static BOOL test_GetDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                return False;
        }
 
-       if (!creds_client_check(&creds, &a.cred)) {
+       if (!creds_client_check(creds, &a.cred)) {
                printf("Credential chaining failed\n");
                return False;
        }
@@ -1016,11 +1330,11 @@ static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct netr_DomainQuery1 q1;
        struct netr_Authenticator a;
 #define ASYNC_COUNT 100
-       struct creds_CredentialState creds;
-       struct creds_CredentialState creds_async[ASYNC_COUNT];
+       struct creds_CredentialState *creds;
+       struct creds_CredentialState *creds_async[ASYNC_COUNT];
        struct rpc_request *req[ASYNC_COUNT];
        int i;
-       int *async_counter = talloc_p(mem_ctx, int);
+       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");
@@ -1035,13 +1349,10 @@ static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        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.unknown1 = 512;
        r.in.level = 1;
        r.in.credential = &a;
-       r.out.credential = &a;
-
-       r.in.i1[0] = 0;
-       r.in.i1[1] = 0;
+       r.in.return_authenticator = &a;
+       r.out.return_authenticator = &a;
 
        r.in.query.query1 = &q1;
        ZERO_STRUCT(q1);
@@ -1059,9 +1370,9 @@ static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        *async_counter = 0;
 
        for (i=0;i<ASYNC_COUNT;i++) {
-               creds_client_authenticator(&creds, &a);
+               creds_client_authenticator(creds, &a);
 
-               creds_async[i] = creds;
+               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;
@@ -1082,7 +1393,7 @@ static BOOL test_GetDomainInfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                        break;
                }
 
-               if (!creds_client_check(&creds_async[i], &a.cred)) {
+               if (!creds_client_check(creds_async[i], &a.cred)) {
                        printf("Credential chaining failed at async %d\n", i);
                        break;
                }
@@ -1116,15 +1427,18 @@ static BOOL test_ManyGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        printf("Torturing GetDCName\n");
 
-       status = dcerpc_secondary_connection(p, &p2, 
-                                            DCERPC_LSARPC_NAME, 
-                                            DCERPC_LSARPC_UUID, 
-                                            DCERPC_LSARPC_VERSION);
+       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;
@@ -1150,7 +1464,7 @@ static BOOL test_ManyGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        t.in.handle = &lsa_handle;
        t.in.resume_handle = &resume_handle;
-       t.in.num_entries = 1000;
+       t.in.max_size = 1000;
        t.out.domains = &domains;
        t.out.resume_handle = &resume_handle;
 
@@ -1162,7 +1476,7 @@ static BOOL test_ManyGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                return False;
        }
 
-       dcerpc_pipe_close(p2);
+       talloc_free(p2);
 
        d.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s",
                                            dcerpc_server_name(p));
@@ -1187,35 +1501,38 @@ static BOOL test_ManyGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
-BOOL torture_rpc_netlogon(void)
+BOOL torture_rpc_netlogon(struct torture_context *torture)
 {
         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, lp_workgroup(), ACB_SVRTRUST, 
-                                      &machine_password);
+       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;
        }
 
-       status = torture_rpc_connection(&p, 
-                                       DCERPC_NETLOGON_NAME,
-                                       DCERPC_NETLOGON_UUID,
-                                       DCERPC_NETLOGON_VERSION);
+       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);
+       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);
@@ -1230,11 +1547,11 @@ BOOL torture_rpc_netlogon(void)
        ret &= test_LogonControl2Ex(p, mem_ctx);
        ret &= test_DsrEnumerateDomainTrusts(p, mem_ctx);
        ret &= test_GetDomainInfo_async(p, mem_ctx);
-       ret &= test_netr_DrsGetDCNameEx2(p, mem_ctx);
-
-       talloc_destroy(mem_ctx);
+       ret &= test_netr_DsRGetDCName(p, mem_ctx);
+       ret &= test_netr_DsRGetDCNameEx(p, mem_ctx);
+       ret &= test_netr_DsRGetDCNameEx2(p, mem_ctx);
 
-       torture_rpc_close(p);
+       talloc_free(mem_ctx);
 
        torture_leave_domain(join_ctx);