r3428: switched to using minimal includes for the auto-generated RPC code.
[sfrench/samba-autobuild/.git] / source4 / torture / rpc / netlogon.c
index e3ff679d97984d0aae5e63e5ffb9871b8eabf079..6971193f92ccf18120055eea5818eef7991eb584 100644 (file)
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 
-#define TEST_MACHINE_NAME "torturetest"
-
-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_GetUserPwInfo pwp;
-       struct samr_SetUserInfo s;
-       union samr_UserInfo u;
-       struct policy_handle handle;
-       struct policy_handle domain_handle;
-       uint32_t access_granted;
-       uint32_t rid;
-       BOOL ret = True;
-       DATA_BLOB session_key;
-       struct samr_Name name;
-       int policy_min_pw_len = 0;
-
-       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;
+static const char *machine_password;
 
-       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;
-       }
-
-       pwp.in.handle = &join.acct_handle;
-
-       status = dcerpc_samr_GetUserPwInfo(join.p, mem_ctx, &pwp);
-       if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = pwp.out.info.min_pwd_len;
-       }
-
-       join.machine_password = generate_random_str(mem_ctx, MAX(8, policy_min_pw_len));
-
-       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;
-}
+#define TEST_MACHINE_NAME "torturetest"
 
 static BOOL test_LogonUasLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
@@ -198,7 +36,7 @@ static BOOL test_LogonUasLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct netr_LogonUasLogon r;
 
        r.in.server_name = NULL;
-       r.in.username = lp_parm_string(-1, "torture", "username");
+       r.in.account_name = lp_parm_string(-1, "torture", "username");
        r.in.workstation = TEST_MACHINE_NAME;
 
        printf("Testing LogonUasLogon\n");
@@ -219,7 +57,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 = lp_parm_string(-1, "torture", "username");
        r.in.workstation = TEST_MACHINE_NAME;
 
        printf("Testing LogonUasLogoff\n");
@@ -240,14 +78,18 @@ static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate a;
+       struct netr_Credential credentials1, credentials2, credentials3;
        const char *plain_pass;
-       uint8 mach_pwd[16];
+       struct samr_Password mach_password;
 
        printf("Testing ServerReqChallenge\n");
 
        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.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)) {
@@ -255,21 +97,23 @@ static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       plain_pass = join.machine_password;
+       plain_pass = 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$", TEST_MACHINE_NAME);
        a.in.secure_channel_type = SEC_CHAN_BDC;
        a.in.computer_name = TEST_MACHINE_NAME;
+       a.in.credentials = &credentials3;
+       a.out.credentials = &credentials3;
+
+       creds_client_init(creds, &credentials1, &credentials2, &mach_password, &credentials3, 
+                         NETLOGON_NEG_AUTH2_FLAGS);
 
        printf("Testing ServerAuthenticate\n");
 
@@ -279,7 +123,7 @@ 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;
        }
@@ -294,14 +138,18 @@ static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate2 a;
+       struct netr_Credential credentials1, credentials2, credentials3;
        const char *plain_pass;
-       uint8 mach_pwd[16];
+       struct samr_Password mach_password;
 
        printf("Testing ServerReqChallenge\n");
 
        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.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)) {
@@ -309,23 +157,25 @@ static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       plain_pass = join.machine_password;
+       plain_pass = 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$", TEST_MACHINE_NAME);
        a.in.secure_channel_type = SEC_CHAN_BDC;
        a.in.computer_name = TEST_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");
 
@@ -335,7 +185,74 @@ 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);
+
+       return True;
+}
+
+
+static BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                                  uint32_t negotiate_flags,
+                                  struct creds_CredentialState *creds)
+{
+       NTSTATUS status;
+       struct netr_ServerReqChallenge r;
+       struct netr_ServerAuthenticate3 a;
+       struct netr_Credential credentials1, credentials2, credentials3;
+       const char *plain_pass;
+       struct samr_Password mach_password;
+       uint32 rid;
+
+       printf("Testing ServerReqChallenge\n");
+
+       r.in.server_name = NULL;
+       r.in.computer_name = TEST_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)) {
+               printf("ServerReqChallenge - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       plain_pass = machine_password;
+       if (!plain_pass) {
+               printf("Unable to fetch machine password!\n");
+               return False;
+       }
+
+       E_md4hash(plain_pass, mach_password.hash);
+
+       a.in.server_name = NULL;
+       a.in.account_name = 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.negotiate_flags = &negotiate_flags;
+       a.in.credentials = &credentials3;
+       a.out.credentials = &credentials3;
+       a.out.negotiate_flags = &negotiate_flags;
+       a.out.rid = &rid;
+
+       creds_client_init(creds, &credentials1, &credentials2, &mach_password, &credentials3,
+                         negotiate_flags);
+
+       printf("Testing ServerAuthenticate3\n");
+
+       status = dcerpc_netr_ServerAuthenticate3(p, mem_ctx, &a);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ServerAuthenticate3 - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!creds_client_check(creds, &credentials3)) {
                printf("Credential chaining failed\n");
                return False;
        }
@@ -355,7 +272,8 @@ enum ntlm_break {
 
 struct samlogon_state {
        TALLOC_CTX *mem_ctx;
-       const char *username;
+       const char *account_name;
+       const char *account_domain;
        const char *password;
        struct dcerpc_pipe *p;
        struct netr_LogonSamLogon r;
@@ -368,147 +286,141 @@ struct samlogon_state {
    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], 
+                              uint8_t lm_key[8], 
+                              uint8_t user_session_key[16], 
                               char **error_string)
 {
        NTSTATUS status;
        struct netr_LogonSamLogon *r = &samlogon_state->r;
-       int levels[] = { 2, 6 };
-       int i;
        struct netr_NetworkInfo ninfo;
 
-       for (i=0;i<ARRAY_SIZE(levels);i++) {
-               printf("testing netr_LogonSamLogon with logon level %d\n", levels[i]);
-
-               samlogon_state->r.in.logon_level = levels[i];
-               samlogon_state->r.in.logon.network = &ninfo;
+       struct netr_SamBaseInfo *base;
+       
+       printf("testing netr_LogonSamLogon\n");
        
-               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;
+       samlogon_state->r.in.logon.network = &ninfo;
+       
+       ninfo.identity_info.domain_name.string = samlogon_state->account_domain;
+       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 = samlogon_state->account_name;
+       ninfo.identity_info.workstation.string = TEST_MACHINE_NAME;
                
-               memcpy(ninfo.challenge, chall->data, 8);
+       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;
+       switch (break_which) {
+       case BREAK_NONE:
+               break;
+       case BREAK_LM:
+               if (lm_response && lm_response->data) {
+                       lm_response->data[0]++;
                }
-               
-               if (nt_response) {
-                       ninfo.nt.data = nt_response->data;
-                       ninfo.nt.length = nt_response->length;
-               } else {
-                       ninfo.nt.data = NULL;
-                       ninfo.nt.length = 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 (lm_response) {
-                       ninfo.lm.data = lm_response->data;
-                       ninfo.lm.length = lm_response->length;
-               } else {
-                       ninfo.lm.data = NULL;
-                       ninfo.lm.length = 0;
-               }
+       if (nt_response) {
+               ninfo.nt.data = nt_response->data;
+               ninfo.nt.length = nt_response->length;
+       } else {
+               ninfo.nt.data = NULL;
+               ninfo.nt.length = 0;
+       }
                
-               ZERO_STRUCT(samlogon_state->auth2);
-               creds_client_authenticator(&samlogon_state->creds, &samlogon_state->auth);
+       if (lm_response) {
+               ninfo.lm.data = lm_response->data;
+               ninfo.lm.length = lm_response->length;
+       } else {
+               ninfo.lm.data = NULL;
+               ninfo.lm.length = 0;
+       }
                
-               r->out.authenticator = NULL;
-               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));
-                       }
-               }
+       ZERO_STRUCT(samlogon_state->auth2);
+       creds_client_authenticator(&samlogon_state->creds, &samlogon_state->auth);
                
-               if (!r->out.authenticator || 
-                   !creds_client_check(&samlogon_state->creds, &r->out.authenticator->cred)) {
-                       printf("Credential chaining failed\n");
+       r->out.return_authenticator = NULL;
+       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 (!r->out.return_authenticator || 
+           !creds_client_check(&samlogon_state->creds, &r->out.return_authenticator->cred)) {
+               printf("Credential chaining failed\n");
+       }
 
-               if (!NT_STATUS_IS_OK(status)) {
-                       /* we cannot check the session key, if the logon failed... */
-                       return status;
-               }
+       if (!NT_STATUS_IS_OK(status)) {
+               /* we cannot check the session key, if the logon failed... */
+               return status;
+       }
                
-               /* 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));
-                       }
+       /* find and decyrpt the session keys, return in parameters above */
+       if (r->in.validation_level == 2) {
+               base = &r->out.validation.sam2->base;
+       } else if (r->in.validation_level == 3) {
+               base = &r->out.validation.sam3->base;
+       } else if (r->in.validation_level == 6) {
+               base = &r->out.validation.sam6->base;
+       } else {
+               base = NULL;
+       }
+
+       if (r->in.validation_level != 6) {
+               static const char zeros[16];
                        
-                       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));
-                       }
-                       
-                       if (user_session_key) {
-                               memcpy(user_session_key, r->out.validation.sam->key.key, 16);
-                       }
-                       
-               } 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));
-                       }
+               if (memcmp(base->key.key, zeros,  
+                          sizeof(base->key.key)) != 0) {
+                       creds_arcfour_crypt(&samlogon_state->creds, 
+                                           base->key.key, 
+                                           sizeof(base->key.key));
+               }
                        
-                       if (lm_key) {
-                               memcpy(lm_key, r->out.validation.sam2->LMSessKey.key, 8);
-                       }
+               if (user_session_key) {
+                       memcpy(user_session_key, base->key.key, 16);
+               }
                        
-                       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));
-                       }
+               if (memcmp(base->LMSessKey.key, zeros,  
+                          sizeof(base->LMSessKey.key)) != 0) {
+                       creds_arcfour_crypt(&samlogon_state->creds, 
+                                           base->LMSessKey.key, 
+                                           sizeof(base->LMSessKey.key));
+               }
                        
-                       if (user_session_key) {
-                               memcpy(user_session_key, r->out.validation.sam2->key.key, 16);
-                       }
+               if (lm_key) {
+                       memcpy(lm_key, base->LMSessKey.key, 8);
+               }
+       } else {
+               /* they aren't encrypted! */
+               if (user_session_key) {
+                       memcpy(user_session_key, base->key.key, 16);
+               }
+               if (lm_key) {
+                       memcpy(lm_key, base->LMSessKey.key, 8);
                }
        }
-
+       
        return status;
 } 
 
+
 /* 
  * Test the normal 'LM and NTLM' combination
  */
@@ -516,22 +428,27 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
 static BOOL test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm_break break_which, char **error_string) 
 {
        BOOL pass = True;
+       BOOL lm_good;
        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];
+       uint8_t lm_key[8];
+       uint8_t user_session_key[16];
+       uint8_t lm_hash[16];
+       uint8_t 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); 
-
+       lm_good = SMBencrypt(samlogon_state->password, samlogon_state->chall.data, lm_response.data);
+       if (!lm_good) {
+               ZERO_STRUCT(lm_hash);
+       } else {
+               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);
@@ -548,14 +465,27 @@ static BOOL test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
        
        data_blob_free(&lm_response);
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
+       if (NT_STATUS_EQUAL(NT_STATUS_WRONG_PASSWORD, nt_status)) {
+               /* for 'long' passwords, the LM password is invalid */
+               if (break_which == NO_NT && !lm_good) {
+                       return True;
+               }
                return break_which == BREAK_NT;
        }
 
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               return False;
+       }
+
+       if (break_which == NO_NT && !lm_good) {
+               printf("LM password is 'long' (> 14 chars and therefore invalid) but login did not fail!");
+               return False;
+       }
+
        if (memcmp(lm_hash, lm_key, 
                   sizeof(lm_key)) != 0) {
                printf("LM Key does not match expectations!\n");
-               printf("lm_key:\n");
+               printf("lm_key:\n");
                dump_data(1, (const char *)lm_key, 8);
                printf("expected:\n");
                dump_data(1, (const char *)lm_hash, 8);
@@ -618,9 +548,9 @@ static BOOL test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
        NTSTATUS nt_status;
        DATA_BLOB nt_response = data_blob_talloc(samlogon_state->mem_ctx, NULL, 24);
 
-       uchar lm_key[8];
-       uchar lm_hash[16];
-       uchar user_session_key[16];
+       uint8_t lm_key[8];
+       uint8_t lm_hash[16];
+       uint8_t user_session_key[16];
        
        ZERO_STRUCT(user_session_key);
 
@@ -674,6 +604,7 @@ static BOOL test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
 static BOOL test_ntlm_in_both(struct samlogon_state *samlogon_state, char **error_string) 
 {
        BOOL pass = True;
+       BOOL lm_good;
        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);
@@ -688,11 +619,14 @@ static BOOL test_ntlm_in_both(struct samlogon_state *samlogon_state, char **erro
 
        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, 
+       E_md4hash(samlogon_state->password, (uint8_t *)nt_hash);
+       SMBsesskeygen_ntv1((const uint8_t *)nt_hash, 
                           session_key.data);
 
-       E_deshash(samlogon_state->password, (unsigned char *)lm_hash); 
+       lm_good = E_deshash(samlogon_state->password, (uint8_t *)lm_hash); 
+       if (!lm_good) {
+               ZERO_STRUCT(lm_hash);
+       }
 
        nt_status = check_samlogon(samlogon_state,
                                   BREAK_NONE,
@@ -743,12 +677,12 @@ static BOOL test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state, enum
        DATA_BLOB ntlmv2_session_key = data_blob(NULL, 0);
        DATA_BLOB names_blob = NTLMv2_generate_names_blob(samlogon_state->mem_ctx, lp_netbios_name(), lp_workgroup());
 
-       uchar user_session_key[16];
+       uint8_t user_session_key[16];
 
        ZERO_STRUCT(user_session_key);
        
        /* TODO - test with various domain cases, and without domain */
-       if (!SMBNTLMv2encrypt(samlogon_state->username, lp_workgroup()
+       if (!SMBNTLMv2encrypt(samlogon_state->account_name, samlogon_state->account_domain
                              samlogon_state->password, &samlogon_state->chall,
                              &names_blob,
                              &lmv2_response, &ntlmv2_response, 
@@ -845,36 +779,33 @@ static BOOL test_plaintext(struct samlogon_state *samlogon_state, enum ntlm_brea
        DATA_BLOB lm_response = data_blob(NULL, 0);
        char *password;
        char *dospw;
-       smb_ucs2_t *unicodepw;
+       void *unicodepw;
 
-       uchar user_session_key[16];
-       uchar lm_key[16];
-       static const uchar zeros[8];
+       uint8_t user_session_key[16];
+       uint8_t lm_key[16];
+       static const uint8_t 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, 
+       if ((push_ucs2_talloc(samlogon_state->mem_ctx, &unicodepw, 
                              samlogon_state->password)) == -1) {
                DEBUG(0, ("push_ucs2_allocate failed!\n"));
                exit(1);
        }
 
-       nt_response = data_blob_talloc(samlogon_state->mem_ctx, unicodepw, 
-                                      strlen_w(((void *)unicodepw))*sizeof(smb_ucs2_t));
+       nt_response = data_blob_talloc(samlogon_state->mem_ctx, unicodepw, utf16_len(unicodepw));
 
-       password = strdup_upper(samlogon_state->password);
+       password = strupper_talloc(samlogon_state->mem_ctx, samlogon_state->password);
 
        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"));
+                                  (void**)&dospw)) == -1) {
+               DEBUG(0, ("convert_string_talloc failed!\n"));
                exit(1);
        }
 
-       SAFE_FREE(password);
-
        lm_response = data_blob_talloc(samlogon_state->mem_ctx, dospw, strlen(dospw));
 
        nt_status = check_samlogon(samlogon_state,
@@ -929,7 +860,7 @@ static BOOL test_plaintext_lm_only(struct samlogon_state *samlogon_state,
    - NTLMv2
    - NTLMv2 and LMv2
    - LMv2
-   - plaintext tests (in challenge-response feilds)
+   - plaintext tests (in challenge-response fields)
   
    check we get the correct session key in each case
    check what values we get for the LM session key
@@ -966,44 +897,57 @@ static const struct ntlm_tests {
 */
 static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
-       int i, j;
+       int i, v, l;
        BOOL ret = True;
-
+       int validation_levels[] = {2,3,6};
+       int logon_levels[] = { 2, 6 };
        struct samlogon_state samlogon_state;
        
        samlogon_state.mem_ctx = mem_ctx;
-       samlogon_state.username = lp_parm_string(-1, "torture", "username");
+       samlogon_state.account_name = lp_parm_string(-1, "torture", "username");
+       samlogon_state.account_domain = lp_parm_string(-1, "torture", "userdomain");
        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);
+       generate_random_buffer(samlogon_state.chall.data, 8);
 
        if (!test_SetupCredentials2(p, mem_ctx, NETLOGON_NEG_AUTH2_FLAGS, &samlogon_state.creds)) {
                return False;
        }
 
+       if (!test_SetupCredentials3(p, mem_ctx, NETLOGON_NEG_AUTH2_FLAGS, &samlogon_state.creds)) {
+               return False;
+       }
+
+       if (!test_SetupCredentials3(p, mem_ctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, &samlogon_state.creds)) {
+               return False;
+       }
+
        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;
-
-       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);
+       samlogon_state.r.in.return_authenticator = &samlogon_state.auth2;
+
+       for (i=0; test_table[i].fn; i++) {
+               for (v=0;v<ARRAY_SIZE(validation_levels);v++) {
+                       for (l=0;l<ARRAY_SIZE(logon_levels);l++) {
+                               char *error_string = NULL;
+                               samlogon_state.r.in.validation_level = validation_levels[v];
+                               samlogon_state.r.in.logon_level = logon_levels[l];
+                               printf("Testing SamLogon with '%s' at validation level %d, logon level %d\n", 
+                                      test_table[i].name, validation_levels[v], logon_levels[l]);
        
-                       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;
+                               if (!test_table[i].fn(&samlogon_state, &error_string)) {
+                                       if (test_table[i].expect_fail) {
+                                               printf("Test %s failed (expected, test incomplete): %s\n", test_table[i].name, error_string);
+                                       } else {
+                                               printf("Test %s failed: %s\n", test_table[i].name, error_string);
+                                               ret = False;
+                                       }
+                                       SAFE_FREE(error_string);
                                }
-                               SAFE_FREE(error_string);
                        }
                }
        }
@@ -1027,12 +971,12 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        }
 
        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.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);
-       E_md4hash(password, r.in.new_password.data);
+       E_md4hash(password, r.in.new_password.hash);
 
        creds_des_encrypt(&creds, &r.in.new_password);
 
@@ -1056,7 +1000,7 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
           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 pervsious run)\n", password);
+       printf("Changing machine account password to '%s' (same as previous run)\n", password);
 
        creds_client_authenticator(&creds, &r.in.credential);
 
@@ -1070,7 +1014,7 @@ static BOOL test_SetPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                printf("Credential chaining failed\n");
        }
 
-       join.machine_password = password;
+       machine_password = password;
 
        if (!test_SetupCredentials(p, mem_ctx, &creds)) {
                printf("ServerPasswordSet failed to actually change the password\n");
@@ -1561,17 +1505,243 @@ 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)
+/*
+  test an ADS style interactive domain login
+*/
+static BOOL test_InteractiveLogin(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                 struct creds_CredentialState *creds)
+{
+       NTSTATUS status;
+       struct netr_LogonSamLogonWithFlags r;
+       struct netr_Authenticator a, ra;
+       struct netr_PasswordInfo pinfo;
+       const char *plain_pass;
+
+       ZERO_STRUCT(r);
+       ZERO_STRUCT(ra);
+
+       creds_client_authenticator(creds, &a);
+
+       r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.workstation = TEST_MACHINE_NAME;
+       r.in.credential = &a;
+       r.in.return_authenticator = &ra;
+       r.in.logon_level = 5;
+       r.in.logon.password = &pinfo;
+       r.in.validation_level = 6;
+       r.in.flags = 0;
+
+       pinfo.identity_info.domain_name.string = lp_parm_string(-1, "torture", "userdomain");
+       pinfo.identity_info.parameter_control = 0;
+       pinfo.identity_info.logon_id_low = 0;
+       pinfo.identity_info.logon_id_high = 0;
+       pinfo.identity_info.account_name.string = lp_parm_string(-1, "torture", "username");
+       pinfo.identity_info.workstation.string = TEST_MACHINE_NAME;
+
+       plain_pass = lp_parm_string(-1, "torture", "password");
+
+       E_deshash(plain_pass, pinfo.lmpassword.hash);
+       E_md4hash(plain_pass, pinfo.ntpassword.hash);
+
+       creds_arcfour_crypt(creds, pinfo.lmpassword.hash, 16);
+       creds_arcfour_crypt(creds, pinfo.ntpassword.hash, 16);
+
+       printf("Testing netr_LogonSamLogonWithFlags\n");
+
+       status = dcerpc_netr_LogonSamLogonWithFlags(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("netr_LogonSamLogonWithFlags - %s\n", nt_errstr(status));
+               exit(1);
+               return False;
+       }
+
+       if (!creds_client_check(creds, &r.out.return_authenticator->cred)) {
+               printf("Credential chaining failed\n");
+               return False;
+       }
+
+       return True;
+}
+
+
+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, &creds)) {
+               return 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.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.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 (!creds_client_check(&creds, &a.cred)) {
+               printf("Credential chaining failed\n");
+               return False;
+       }
+
+       test_InteractiveLogin(p, mem_ctx, &creds);
+
+       return True;
+}
+
+
+static void async_callback(struct rpc_request *req)
+{
+       int *counter = req->async.private;
+       if (NT_STATUS_IS_OK(req->status)) {
+               (*counter)++;
+       }
+}
+
+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 = 0;
+
+       if (!test_SetupCredentials3(p, mem_ctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, &creds)) {
+               return 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.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.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);
+
+       for (i=0;i<ASYNC_COUNT;i++) {
+               creds_client_authenticator(&creds, &a);
+
+               creds_async[i] = 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;
+               }
+       }
+
+       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;
+               }
+       }
+
+       printf("Testing netr_LogonGetDomainInfo - async count %d OK\n", async_counter);
+
+       return async_counter == ASYNC_COUNT;
+}
+
+
+BOOL torture_rpc_netlogon(void)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
+       void *join_ctx;
 
        mem_ctx = talloc_init("torture_rpc_netlogon");
 
-       if (!join_domain_bdc(mem_ctx)) {
+       join_ctx = torture_join_domain(TEST_MACHINE_NAME, lp_workgroup(), ACB_SVRTRUST, 
+                                      &machine_password);
+       if (!join_ctx) {
                printf("Failed to join as BDC\n");
                return False;
        }
@@ -1600,6 +1770,10 @@ BOOL torture_rpc_netlogon(int dummy)
                ret = False;
        }
 
+       if (!test_GetDomainInfo(p, mem_ctx)) {
+               ret = False;
+       }
+
        if (!test_DatabaseSync(p, mem_ctx)) {
                ret = False;
        }
@@ -1640,12 +1814,19 @@ BOOL torture_rpc_netlogon(int dummy)
                ret = False;
        }
 
-        torture_rpc_close(p);
+       if (!test_DsrEnumerateDomainTrusts(p, mem_ctx)) {
+               ret = False;
+       }
 
-       if (!leave_domain_bdc(mem_ctx)) {
-               printf("Failed to delete BDC machine account\n");
-               return False;
+       if (!test_GetDomainInfo_async(p, mem_ctx)) {
+               ret = False;
        }
 
+       talloc_destroy(mem_ctx);
+
+       torture_rpc_close(p);
+
+       torture_leave_domain(join_ctx);
+
        return ret;
 }