r20149: Remove the smb.conf distinction between PDC and BDC. Now the correct
[jra/samba/.git] / source4 / torture / rpc / samr.c
index 9c63e654a393725e1b7be06330ff6c0e2121fe42..28dd03e803c4d4cb0c1c0902b830f4a3143a0b25 100644 (file)
 */
 
 #include "includes.h"
+#include "torture/torture.h"
+#include "system/time.h"
+#include "librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
+#include "lib/crypto/crypto.h"
+#include "libcli/auth/libcli_auth.h"
+#include "libcli/security/security.h"
+#include "torture/rpc/rpc.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
 #define TEST_ALIASNAME "samrtorturetestalias"
 #define TEST_GROUPNAME "samrtorturetestgroup"
-#define TEST_MACHINENAME "samrtorturetestmach$"
-#define TEST_DOMAINNAME "samrtorturetestdom$"
+#define TEST_MACHINENAME "samrtestmach$"
+#define TEST_DOMAINNAME "samrtestdom$"
 
+enum torture_samr_choice {
+       TORTURE_SAMR_PASSWORDS,
+       TORTURE_SAMR_USER_ATTRIBUTES,
+       TORTURE_SAMR_OTHER
+};
 
 static BOOL test_QueryUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                               struct policy_handle *handle);
@@ -38,13 +51,17 @@ static BOOL test_QueryUserInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 static BOOL test_QueryAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                               struct policy_handle *handle);
 
-static void init_samr_Name(struct samr_Name *name, const char *s)
+static BOOL test_ChangePassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                               const char *acct_name, 
+                               struct policy_handle *domain_handle, char **password);
+
+static void init_lsa_String(struct lsa_String *string, const char *s)
 {
-       name->name = s;
+       string->string = s;
 }
 
-static BOOL test_Close(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                      struct policy_handle *handle)
+BOOL test_samr_handle_Close(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                  struct policy_handle *handle)
 {
        NTSTATUS status;
        struct samr_Close r;
@@ -67,7 +84,7 @@ static BOOL test_Shutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        NTSTATUS status;
        struct samr_Shutdown r;
 
-       if (lp_parm_int(-1, "torture", "dangerous") != 1) {
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
                printf("samr_Shutdown disabled - enable dangerous tests to use\n");
                return True;
        }
@@ -90,19 +107,19 @@ static BOOL test_SetDsrmPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
        NTSTATUS status;
        struct samr_SetDsrmPassword r;
-       struct samr_Name name;
+       struct lsa_String string;
        struct samr_Password hash;
 
-       if (lp_parm_int(-1, "torture", "dangerous") != 1) {
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
                printf("samr_SetDsrmPassword disabled - enable dangerous tests to use\n");
                return True;
        }
 
        E_md4hash("TeSTDSRM123", hash.hash);
 
-       init_samr_Name(&name, "Administrator");
+       init_lsa_String(&string, "Administrator");
 
-       r.in.name = &name;
+       r.in.name = &string;
        r.in.unknown = 0;
        r.in.hash = &hash;
 
@@ -142,6 +159,11 @@ static BOOL test_QuerySecurity(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        s.in.sec_info = 7;
        s.in.sdbuf = r.out.sdbuf;
 
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping SetSecurity test against Samba4\n");
+               return True;
+       }
+
        status = dcerpc_samr_SetSecurity(p, mem_ctx, &s);
        if (!NT_STATUS_IS_OK(status)) {
                printf("SetSecurity failed - %s\n", nt_errstr(status));
@@ -159,7 +181,8 @@ static BOOL test_QuerySecurity(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                            struct policy_handle *handle, uint32_t base_acct_flags)
+                            struct policy_handle *handle, uint32_t base_acct_flags,
+                            const char *base_account_name)
 {
        NTSTATUS status;
        struct samr_SetUserInfo s;
@@ -168,11 +191,12 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct samr_QueryUserInfo q0;
        union samr_UserInfo u;
        BOOL ret = True;
+       const char *test_account_name;
 
        uint32_t user_extra_flags = 0;
        if (base_acct_flags == ACB_NORMAL) {
-               /* Don't know what this is, but it is always here for users - you can't get rid of it */
-               user_extra_flags = 0x20000;
+               /* When created, accounts are expired by default */
+               user_extra_flags = ACB_PW_EXPIRED;
        }
 
        s.in.user_handle = handle;
@@ -188,29 +212,29 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 #define TESTCALL(call, r) \
                status = dcerpc_samr_ ##call(p, mem_ctx, &r); \
                if (!NT_STATUS_IS_OK(status)) { \
-                       printf(#call " level %u failed - %s (line %d)\n", \
-                              r.in.level, nt_errstr(status), __LINE__); \
+                       printf(#call " level %u failed - %s (%s)\n", \
+                              r.in.level, nt_errstr(status), __location__); \
                        ret = False; \
                        break; \
                }
 
 #define STRING_EQUAL(s1, s2, field) \
                if ((s1 && !s2) || (s2 && !s1) || strcmp(s1, s2)) { \
-                       printf("Failed to set %s to '%s' (line %d)\n", \
-                              #field, s2, __LINE__); \
+                       printf("Failed to set %s to '%s' (%s)\n", \
+                              #field, s2, __location__); \
                        ret = False; \
                        break; \
                }
 
 #define INT_EQUAL(i1, i2, field) \
                if (i1 != i2) { \
-                       printf("Failed to set %s to 0x%x - got 0x%x (line %d)\n", \
-                              #field, i2, i1, __LINE__); \
+                       printf("Failed to set %s to 0x%x - got 0x%x (%s)\n", \
+                              #field, i2, i1, __location__); \
                        ret = False; \
                        break; \
                }
 
-#define TEST_USERINFO_NAME(lvl1, field1, lvl2, field2, value, fpval) do { \
+#define TEST_USERINFO_STRING(lvl1, field1, lvl2, field2, value, fpval) do { \
                printf("field test %d/%s vs %d/%s\n", lvl1, #field1, lvl2, #field2); \
                q.in.level = lvl1; \
                TESTCALL(QueryUserInfo, q) \
@@ -221,17 +245,17 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        ZERO_STRUCT(u.info21); \
                        u.info21.fields_present = fpval; \
                } \
-               init_samr_Name(&u.info ## lvl1.field1, value); \
+               init_lsa_String(&u.info ## lvl1.field1, value); \
                TESTCALL(SetUserInfo, s) \
                TESTCALL(SetUserInfo2, s2) \
-               init_samr_Name(&u.info ## lvl1.field1, ""); \
+               init_lsa_String(&u.info ## lvl1.field1, ""); \
                TESTCALL(QueryUserInfo, q); \
                u = *q.out.info; \
-               STRING_EQUAL(u.info ## lvl1.field1.name, value, field1); \
+               STRING_EQUAL(u.info ## lvl1.field1.string, value, field1); \
                q.in.level = lvl2; \
                TESTCALL(QueryUserInfo, q) \
                u = *q.out.info; \
-               STRING_EQUAL(u.info ## lvl2.field2.name, value, field2); \
+               STRING_EQUAL(u.info ## lvl2.field2.string, value, field2); \
        } while (0)
 
 #define TEST_USERINFO_INT_EXP(lvl1, field1, lvl2, field2, value, exp_value, fpval) do { \
@@ -242,11 +266,11 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                s2.in.level = lvl1; \
                u = *q.out.info; \
                if (lvl1 == 21) { \
-                       uint8_t *bitmap = u.info21.logon_hours.bitmap; \
+                       uint8_t *bits = u.info21.logon_hours.bits; \
                        ZERO_STRUCT(u.info21); \
                        if (fpval == SAMR_FIELD_LOGON_HOURS) { \
                                u.info21.logon_hours.units_per_week = 168; \
-                               u.info21.logon_hours.bitmap = bitmap; \
+                               u.info21.logon_hours.bits = bits; \
                        } \
                        u.info21.fields_present = fpval; \
                } \
@@ -270,48 +294,80 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        q0.in.level = 12;
        do { TESTCALL(QueryUserInfo, q0) } while (0);
 
-       TEST_USERINFO_NAME(2, comment,  1, comment, "xx2-1 comment", 0);
-       TEST_USERINFO_NAME(2, comment, 21, comment, "xx2-21 comment", 0);
-       TEST_USERINFO_NAME(21, comment, 21, comment, "xx21-21 comment", 
+       TEST_USERINFO_STRING(2, comment,  1, comment, "xx2-1 comment", 0);
+       TEST_USERINFO_STRING(2, comment, 21, comment, "xx2-21 comment", 0);
+       TEST_USERINFO_STRING(21, comment, 21, comment, "xx21-21 comment", 
                           SAMR_FIELD_COMMENT);
 
-       TEST_USERINFO_NAME(6, full_name,  1, full_name, "xx6-1 full_name", 0);
-       TEST_USERINFO_NAME(6, full_name,  3, full_name, "xx6-3 full_name", 0);
-       TEST_USERINFO_NAME(6, full_name,  5, full_name, "xx6-5 full_name", 0);
-       TEST_USERINFO_NAME(6, full_name,  6, full_name, "xx6-6 full_name", 0);
-       TEST_USERINFO_NAME(6, full_name,  8, full_name, "xx6-8 full_name", 0);
-       TEST_USERINFO_NAME(6, full_name, 21, full_name, "xx6-21 full_name", 0);
-       TEST_USERINFO_NAME(8, full_name, 21, full_name, "xx8-21 full_name", 0);
-       TEST_USERINFO_NAME(21, full_name, 21, full_name, "xx21-21 full_name", 
-                          SAMR_FIELD_NAME);
-
-       TEST_USERINFO_NAME(11, logon_script, 3, logon_script, "xx11-3 logon_script", 0);
-       TEST_USERINFO_NAME(11, logon_script, 5, logon_script, "xx11-5 logon_script", 0);
-       TEST_USERINFO_NAME(11, logon_script, 21, logon_script, "xx11-21 logon_script", 0);
-       TEST_USERINFO_NAME(21, logon_script, 21, logon_script, "xx21-21 logon_script", 
+       test_account_name = talloc_asprintf(mem_ctx, "%sxx7-1", base_account_name);
+       TEST_USERINFO_STRING(7, account_name,  1, account_name, base_account_name, 0);
+       test_account_name = talloc_asprintf(mem_ctx, "%sxx7-3", base_account_name);
+       TEST_USERINFO_STRING(7, account_name,  3, account_name, base_account_name, 0);
+       test_account_name = talloc_asprintf(mem_ctx, "%sxx7-5", base_account_name);
+       TEST_USERINFO_STRING(7, account_name,  5, account_name, base_account_name, 0);
+       test_account_name = talloc_asprintf(mem_ctx, "%sxx7-6", base_account_name);
+       TEST_USERINFO_STRING(7, account_name,  6, account_name, base_account_name, 0);
+       test_account_name = talloc_asprintf(mem_ctx, "%sxx7-7", base_account_name);
+       TEST_USERINFO_STRING(7, account_name,  7, account_name, base_account_name, 0);
+       test_account_name = talloc_asprintf(mem_ctx, "%sxx7-21", base_account_name);
+       TEST_USERINFO_STRING(7, account_name, 21, account_name, base_account_name, 0);
+       test_account_name = base_account_name;
+       TEST_USERINFO_STRING(21, account_name, 21, account_name, base_account_name, 
+                          SAMR_FIELD_ACCOUNT_NAME);
+
+       TEST_USERINFO_STRING(6, full_name,  1, full_name, "xx6-1 full_name", 0);
+       TEST_USERINFO_STRING(6, full_name,  3, full_name, "xx6-3 full_name", 0);
+       TEST_USERINFO_STRING(6, full_name,  5, full_name, "xx6-5 full_name", 0);
+       TEST_USERINFO_STRING(6, full_name,  6, full_name, "xx6-6 full_name", 0);
+       TEST_USERINFO_STRING(6, full_name,  8, full_name, "xx6-8 full_name", 0);
+       TEST_USERINFO_STRING(6, full_name, 21, full_name, "xx6-21 full_name", 0);
+       TEST_USERINFO_STRING(8, full_name, 21, full_name, "xx8-21 full_name", 0);
+       TEST_USERINFO_STRING(21, full_name, 21, full_name, "xx21-21 full_name", 
+                          SAMR_FIELD_FULL_NAME);
+
+       TEST_USERINFO_STRING(11, logon_script, 3, logon_script, "xx11-3 logon_script", 0);
+       TEST_USERINFO_STRING(11, logon_script, 5, logon_script, "xx11-5 logon_script", 0);
+       TEST_USERINFO_STRING(11, logon_script, 21, logon_script, "xx11-21 logon_script", 0);
+       TEST_USERINFO_STRING(21, logon_script, 21, logon_script, "xx21-21 logon_script", 
                           SAMR_FIELD_LOGON_SCRIPT);
 
-       TEST_USERINFO_NAME(12, profile_path,  3, profile_path, "xx12-3 profile_path", 0);
-       TEST_USERINFO_NAME(12, profile_path,  5, profile_path, "xx12-5 profile_path", 0);
-       TEST_USERINFO_NAME(12, profile_path, 21, profile_path, "xx12-21 profile_path", 0);
-       TEST_USERINFO_NAME(21, profile_path, 21, profile_path, "xx21-21 profile_path", 
+       TEST_USERINFO_STRING(12, profile_path,  3, profile_path, "xx12-3 profile_path", 0);
+       TEST_USERINFO_STRING(12, profile_path,  5, profile_path, "xx12-5 profile_path", 0);
+       TEST_USERINFO_STRING(12, profile_path, 21, profile_path, "xx12-21 profile_path", 0);
+       TEST_USERINFO_STRING(21, profile_path, 21, profile_path, "xx21-21 profile_path", 
                           SAMR_FIELD_PROFILE_PATH);
 
-       TEST_USERINFO_NAME(13, description,  1, description, "xx13-1 description", 0);
-       TEST_USERINFO_NAME(13, description,  5, description, "xx13-5 description", 0);
-       TEST_USERINFO_NAME(13, description, 21, description, "xx13-21 description", 0);
-       TEST_USERINFO_NAME(21, description, 21, description, "xx21-21 description", 
+       TEST_USERINFO_STRING(10, home_directory, 3, home_directory, "xx10-3 home_directory", 0);
+       TEST_USERINFO_STRING(10, home_directory, 5, home_directory, "xx10-5 home_directory", 0);
+       TEST_USERINFO_STRING(10, home_directory, 21, home_directory, "xx10-21 home_directory", 0);
+       TEST_USERINFO_STRING(21, home_directory, 21, home_directory, "xx21-21 home_directory",
+                            SAMR_FIELD_HOME_DIRECTORY);
+       TEST_USERINFO_STRING(21, home_directory, 10, home_directory, "xx21-10 home_directory",
+                            SAMR_FIELD_HOME_DIRECTORY);
+
+       TEST_USERINFO_STRING(10, home_drive, 3, home_drive, "xx10-3 home_drive", 0);
+       TEST_USERINFO_STRING(10, home_drive, 5, home_drive, "xx10-5 home_drive", 0);
+       TEST_USERINFO_STRING(10, home_drive, 21, home_drive, "xx10-21 home_drive", 0);
+       TEST_USERINFO_STRING(21, home_drive, 21, home_drive, "xx21-21 home_drive",
+                            SAMR_FIELD_HOME_DRIVE);
+       TEST_USERINFO_STRING(21, home_drive, 10, home_drive, "xx21-10 home_drive",
+                            SAMR_FIELD_HOME_DRIVE);
+       
+       TEST_USERINFO_STRING(13, description,  1, description, "xx13-1 description", 0);
+       TEST_USERINFO_STRING(13, description,  5, description, "xx13-5 description", 0);
+       TEST_USERINFO_STRING(13, description, 21, description, "xx13-21 description", 0);
+       TEST_USERINFO_STRING(21, description, 21, description, "xx21-21 description", 
                           SAMR_FIELD_DESCRIPTION);
 
-       TEST_USERINFO_NAME(14, workstations,  3, workstations, "14workstation3", 0);
-       TEST_USERINFO_NAME(14, workstations,  5, workstations, "14workstation4", 0);
-       TEST_USERINFO_NAME(14, workstations, 21, workstations, "14workstation21", 0);
-       TEST_USERINFO_NAME(21, workstations, 21, workstations, "21workstation21", 
-                          SAMR_FIELD_WORKSTATION);
+       TEST_USERINFO_STRING(14, workstations,  3, workstations, "14workstation3", 0);
+       TEST_USERINFO_STRING(14, workstations,  5, workstations, "14workstation4", 0);
+       TEST_USERINFO_STRING(14, workstations, 21, workstations, "14workstation21", 0);
+       TEST_USERINFO_STRING(21, workstations, 21, workstations, "21workstation21", 
+                          SAMR_FIELD_WORKSTATIONS);
 
-       TEST_USERINFO_NAME(20, callback, 21, callback, "xx20-21 callback", 0);
-       TEST_USERINFO_NAME(21, callback, 21, callback, "xx21-21 callback", 
-                          SAMR_FIELD_CALLBACK);
+       TEST_USERINFO_STRING(20, parameters, 21, parameters, "xx20-21 parameters", 0);
+       TEST_USERINFO_STRING(21, parameters, 21, parameters, "xx21-21 parameters", 
+                          SAMR_FIELD_PARAMETERS);
 
        TEST_USERINFO_INT(2, country_code, 21, country_code, __LINE__, 0);
        TEST_USERINFO_INT(21, country_code, 21, country_code, __LINE__, 
@@ -321,40 +377,74 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        TEST_USERINFO_INT(21, code_page, 21, code_page, __LINE__, 
                          SAMR_FIELD_CODE_PAGE);
 
-       TEST_USERINFO_INT(4, logon_hours.bitmap[3],  3, logon_hours.bitmap[3], 1, 0);
-       TEST_USERINFO_INT(4, logon_hours.bitmap[3],  5, logon_hours.bitmap[3], 2, 0);
-       TEST_USERINFO_INT(4, logon_hours.bitmap[3], 21, logon_hours.bitmap[3], 3, 0);
-       TEST_USERINFO_INT(21, logon_hours.bitmap[3], 21, logon_hours.bitmap[3], 4, 
+       TEST_USERINFO_INT(4, logon_hours.bits[3],  3, logon_hours.bits[3], 1, 0);
+       TEST_USERINFO_INT(4, logon_hours.bits[3],  5, logon_hours.bits[3], 2, 0);
+       TEST_USERINFO_INT(4, logon_hours.bits[3], 21, logon_hours.bits[3], 3, 0);
+       TEST_USERINFO_INT(21, logon_hours.bits[3], 21, logon_hours.bits[3], 4, 
                          SAMR_FIELD_LOGON_HOURS);
 
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping Set Account Flag tests against Samba4\n");
+               return ret;
+       }
+
        TEST_USERINFO_INT_EXP(16, acct_flags, 5, acct_flags, 
-                         (base_acct_flags  | ACB_DISABLED | ACB_HOMDIRREQ), 
-                         (base_acct_flags  | ACB_DISABLED | ACB_HOMDIRREQ | user_extra_flags), 
-                         0);
+                             (base_acct_flags  | ACB_DISABLED | ACB_HOMDIRREQ), 
+                             (base_acct_flags  | ACB_DISABLED | ACB_HOMDIRREQ | user_extra_flags), 
+                             0);
        TEST_USERINFO_INT_EXP(16, acct_flags, 5, acct_flags, 
-                         (base_acct_flags  | ACB_DISABLED), 
-                         (base_acct_flags  | ACB_DISABLED | user_extra_flags), 
-                         0);
+                             (base_acct_flags  | ACB_DISABLED), 
+                             (base_acct_flags  | ACB_DISABLED | user_extra_flags), 
+                             0);
        
-       /* Setting PWNOEXP clears the magic 0x20000 flag */
+       /* Setting PWNOEXP clears the magic ACB_PW_EXPIRED flag */
        TEST_USERINFO_INT_EXP(16, acct_flags, 5, acct_flags, 
-                         (base_acct_flags  | ACB_DISABLED | ACB_PWNOEXP), 
-                         (base_acct_flags  | ACB_DISABLED | ACB_PWNOEXP), 
-                         0);
+                             (base_acct_flags  | ACB_DISABLED | ACB_PWNOEXP), 
+                             (base_acct_flags  | ACB_DISABLED | ACB_PWNOEXP), 
+                             0);
        TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
-                         (base_acct_flags | ACB_DISABLED | ACB_HOMDIRREQ), 
-                         (base_acct_flags | ACB_DISABLED | ACB_HOMDIRREQ | user_extra_flags), 
-                         0);
+                             (base_acct_flags | ACB_DISABLED | ACB_HOMDIRREQ), 
+                             (base_acct_flags | ACB_DISABLED | ACB_HOMDIRREQ | user_extra_flags), 
+                             0);
+
 
        /* The 'autolock' flag doesn't stick - check this */
        TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
-                         (base_acct_flags | ACB_DISABLED | ACB_AUTOLOCK), 
-                         (base_acct_flags | ACB_DISABLED | user_extra_flags), 
-                         0);
+                             (base_acct_flags | ACB_DISABLED | ACB_AUTOLOCK), 
+                             (base_acct_flags | ACB_DISABLED | user_extra_flags), 
+                             0);
+#if 0
+       /* Removing the 'disabled' flag doesn't stick - check this */
+       TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
+                             (base_acct_flags), 
+                             (base_acct_flags | ACB_DISABLED | user_extra_flags), 
+                             0);
+#endif
+       /* The 'store plaintext' flag does stick */
+       TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
+                             (base_acct_flags | ACB_DISABLED | ACB_ENC_TXT_PWD_ALLOWED), 
+                             (base_acct_flags | ACB_DISABLED | ACB_ENC_TXT_PWD_ALLOWED | user_extra_flags), 
+                             0);
+       /* The 'use DES' flag does stick */
+       TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
+                             (base_acct_flags | ACB_DISABLED | ACB_USE_DES_KEY_ONLY), 
+                             (base_acct_flags | ACB_DISABLED | ACB_USE_DES_KEY_ONLY | user_extra_flags), 
+                             0);
+       /* The 'don't require kerberos pre-authentication flag does stick */
+       TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
+                             (base_acct_flags | ACB_DISABLED | ACB_DONT_REQUIRE_PREAUTH), 
+                             (base_acct_flags | ACB_DISABLED | ACB_DONT_REQUIRE_PREAUTH | user_extra_flags), 
+                             0);
+       /* The 'no kerberos PAC required' flag sticks */
+       TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, 
+                             (base_acct_flags | ACB_DISABLED | ACB_NO_AUTH_DATA_REQD), 
+                             (base_acct_flags | ACB_DISABLED | ACB_NO_AUTH_DATA_REQD | user_extra_flags), 
+                             0);
+
        TEST_USERINFO_INT_EXP(21, acct_flags, 21, acct_flags, 
-                         (base_acct_flags | ACB_DISABLED), 
-                         (base_acct_flags | ACB_DISABLED | user_extra_flags), 
-                         SAMR_FIELD_ACCT_FLAGS);
+                             (base_acct_flags | ACB_DISABLED), 
+                             (base_acct_flags | ACB_DISABLED | user_extra_flags), 
+                             SAMR_FIELD_ACCT_FLAGS);
 
 #if 0
        /* these fail with win2003 - it appears you can't set the primary gid?
@@ -364,6 +454,7 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        TEST_USERINFO_INT(9, primary_gid,  5, primary_gid, 513);
        TEST_USERINFO_INT(9, primary_gid, 21, primary_gid, 513);
 #endif
+
        return ret;
 }
 
@@ -378,6 +469,16 @@ static char *samr_rand_pass(TALLOC_CTX *mem_ctx, int min_len)
        return s;
 }
 
+/*
+  generate a random password for password change tests (fixed length)
+*/
+static char *samr_rand_pass_fixed_len(TALLOC_CTX *mem_ctx, int len)
+{
+       char *s = generate_random_str(mem_ctx, len);
+       printf("Generated password '%s'\n", s);
+       return s;
+}
+
 static BOOL test_SetUserPass(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                             struct policy_handle *handle, char **password)
 {
@@ -393,7 +494,7 @@ static BOOL test_SetUserPass(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        status = dcerpc_samr_GetUserPwInfo(p, mem_ctx, &pwp);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = pwp.out.info.min_password_len;
+               policy_min_pw_len = pwp.out.info.min_password_length;
        }
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
@@ -430,7 +531,7 @@ static BOOL test_SetUserPass(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_SetUserPass_23(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                               struct policy_handle *handle, uint32 fields_present,
+                               struct policy_handle *handle, uint32_t fields_present,
                                char **password)
 {
        NTSTATUS status;
@@ -445,7 +546,7 @@ static BOOL test_SetUserPass_23(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        status = dcerpc_samr_GetUserPwInfo(p, mem_ctx, &pwp);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = pwp.out.info.min_password_len;
+               policy_min_pw_len = pwp.out.info.min_password_length;
        }
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
@@ -501,7 +602,7 @@ static BOOL test_SetUserPassEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        status = dcerpc_samr_GetUserPwInfo(p, mem_ctx, &pwp);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = pwp.out.info.min_password_len;
+               policy_min_pw_len = pwp.out.info.min_password_length;
        }
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
@@ -544,7 +645,7 @@ static BOOL test_SetUserPassEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_SetUserPass_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                               struct policy_handle *handle, uint32 fields_present,
+                               struct policy_handle *handle, uint32_t fields_present,
                                char **password)
 {
        NTSTATUS status;
@@ -562,7 +663,7 @@ static BOOL test_SetUserPass_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        status = dcerpc_samr_GetUserPwInfo(p, mem_ctx, &pwp);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = pwp.out.info.min_password_len;
+               policy_min_pw_len = pwp.out.info.min_password_length;
        }
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
@@ -626,9 +727,10 @@ static BOOL test_SetAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
                r.in.alias_handle = handle;
                r.in.level = levels[i];
+               r.in.info  = talloc(mem_ctx, union samr_AliasInfo);
                switch (r.in.level) {
-                   case 2 : init_samr_Name(&r.in.info.name,TEST_ALIASNAME); break;
-                   case 3 : init_samr_Name(&r.in.info.description,
+                   case ALIASINFONAME: init_lsa_String(&r.in.info->name,TEST_ALIASNAME); break;
+                   case ALIASINFODESCRIPTION: init_lsa_String(&r.in.info->description,
                                "Test Description, should test I18N as well"); break;
                }
 
@@ -675,14 +777,14 @@ static BOOL test_GetGroupsForUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                             struct samr_Name *domain_name)
+                             struct lsa_String *domain_name)
 {
        NTSTATUS status;
        struct samr_GetDomPwInfo r;
        BOOL ret = True;
 
-       r.in.name = domain_name;
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->name);
+       r.in.domain_name = domain_name;
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -690,8 +792,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       r.in.name->name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->name);
+       r.in.domain_name->string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -699,8 +801,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       r.in.name->name = "\\\\__NONAME__";
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->name);
+       r.in.domain_name->string = "\\\\__NONAME__";
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -708,8 +810,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       r.in.name->name = "\\\\Builtin";
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->name);
+       r.in.domain_name->string = "\\\\Builtin";
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -747,9 +849,9 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
        NTSTATUS status;
        struct samr_LookupNames n;
-       struct samr_Name sname[2];
+       struct lsa_String sname[2];
 
-       init_samr_Name(&sname[0], name);
+       init_lsa_String(&sname[0], name);
 
        n.in.domain_handle = domain_handle;
        n.in.num_names = 1;
@@ -761,7 +863,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return status;
        }
 
-       init_samr_Name(&sname[1], "xxNONAMExx");
+       init_lsa_String(&sname[1], "xxNONAMExx");
        n.in.num_names = 2;
        status = dcerpc_samr_LookupNames(p, mem_ctx, &n);
        if (!NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
@@ -769,7 +871,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return status;
        }
 
-       init_samr_Name(&sname[1], "xxNONAMExx");
+       init_lsa_String(&sname[1], "xxNONAMExx");
        n.in.num_names = 0;
        status = dcerpc_samr_LookupNames(p, mem_ctx, &n);
        if (!NT_STATUS_IS_OK(status)) {
@@ -793,12 +895,12 @@ static NTSTATUS test_OpenUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        r.in.domain_handle = domain_handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.user_handle = user_handle;
        status = dcerpc_samr_OpenUser(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("OpenUser_byname(%s) failed - %s\n", name, nt_errstr(status));
+               printf("OpenUser_byname(%s -> %d) failed - %s\n", name, rid, nt_errstr(status));
        }
 
        return status;
@@ -858,7 +960,7 @@ static BOOL test_ChangePasswordNT3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       if (!test_Close(p, mem_ctx, &user_handle)) {
+       if (!test_samr_handle_Close(p, mem_ctx, &user_handle)) {
                ret = False;
        }
 
@@ -867,6 +969,7 @@ static BOOL test_ChangePasswordNT3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 #endif
 
 static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                   const char *acct_name, 
                                    struct policy_handle *handle, char **password)
 {
        NTSTATUS status;
@@ -874,7 +977,7 @@ static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        BOOL ret = True;
        struct samr_Password hash1, hash2, hash3, hash4, hash5, hash6;
        struct policy_handle user_handle;
-       char *oldpass = *password;
+       char *oldpass;
        uint8_t old_nt_hash[16], new_nt_hash[16];
        uint8_t old_lm_hash[16], new_lm_hash[16];
 
@@ -882,7 +985,7 @@ static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct samr_GetUserPwInfo pwp;
        int policy_min_pw_len = 0;
 
-       status = test_OpenUser_byname(p, mem_ctx, handle, TEST_ACCOUNT_NAME, &user_handle);
+       status = test_OpenUser_byname(p, mem_ctx, handle, acct_name, &user_handle);
        if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
@@ -890,12 +993,19 @@ static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        status = dcerpc_samr_GetUserPwInfo(p, mem_ctx, &pwp);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = pwp.out.info.min_password_len;
+               policy_min_pw_len = pwp.out.info.min_password_length;
        }
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
        printf("Testing ChangePasswordUser\n");
 
+       if (!*password) {
+               printf("Failing ChangePasswordUser as old password was NULL.  Previous test failed?\n");
+               return False;
+       }
+
+       oldpass = *password;
+
        E_md4hash(oldpass, old_nt_hash);
        E_md4hash(newpass, new_nt_hash);
        E_deshash(oldpass, old_lm_hash);
@@ -921,14 +1031,16 @@ static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.lm_cross = &hash6;
 
        status = dcerpc_samr_ChangePasswordUser(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
+       if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) {
+               printf("ChangePasswordUser returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status));
+       } else  if (!NT_STATUS_IS_OK(status)) {
                printf("ChangePasswordUser failed - %s\n", nt_errstr(status));
                ret = False;
        } else {
                *password = newpass;
        }
 
-       if (!test_Close(p, mem_ctx, &user_handle)) {
+       if (!test_samr_handle_Close(p, mem_ctx, &user_handle)) {
                ret = False;
        }
 
@@ -937,6 +1049,7 @@ static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                       const char *acct_name,
                                        struct policy_handle *handle, char **password)
 {
        NTSTATUS status;
@@ -944,29 +1057,37 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
        BOOL ret = True;
        struct samr_Password lm_verifier;
        struct samr_CryptPassword lm_pass;
-       struct samr_AsciiName server, account;
-       char *oldpass = *password;
+       struct lsa_AsciiString server, account, account_bad;
+       char *oldpass;
        char *newpass;
        uint8_t old_lm_hash[16], new_lm_hash[16];
 
        struct samr_GetDomPwInfo dom_pw_info;
        int policy_min_pw_len = 0;
 
-       struct samr_Name domain_name;
-       domain_name.name = "";
-       dom_pw_info.in.name = &domain_name;
+       struct lsa_String domain_name;
+
+       domain_name.string = "";
+       dom_pw_info.in.domain_name = &domain_name;
 
        printf("Testing OemChangePasswordUser2\n");
 
+       if (!*password) {
+               printf("Failing OemChangePasswordUser2 as old password was NULL.  Previous test failed?\n");
+               return False;
+       }
+
+       oldpass = *password;
+
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &dom_pw_info);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = dom_pw_info.out.info.min_password_len;
+               policy_min_pw_len = dom_pw_info.out.info.min_password_length;
        }
 
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
-       server.name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       account.name = TEST_ACCOUNT_NAME;
+       server.string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       account.string = acct_name;
 
        E_deshash(oldpass, old_lm_hash);
        E_deshash(newpass, new_lm_hash);
@@ -980,8 +1101,46 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
        r.in.password = &lm_pass;
        r.in.hash = &lm_verifier;
 
+       /* Break the verification */
+       lm_verifier.hash[0]++;
+
        status = dcerpc_samr_OemChangePasswordUser2(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)
+           && !NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) {
+               printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalid password verifier - %s\n",
+                       nt_errstr(status));
+               ret = False;
+       }
+
+       /* This shouldn't be a valid name */
+       account_bad.string = TEST_ACCOUNT_NAME "XX";
+       r.in.account = &account_bad;
+
+       status = dcerpc_samr_OemChangePasswordUser2(p, mem_ctx, &r);
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) {
+               printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD for invalid user - %s\n",
+                       nt_errstr(status));
+               ret = False;
+       }
+
+       E_deshash(oldpass, old_lm_hash);
+       E_deshash(newpass, new_lm_hash);
+
+       encode_pw_buffer(lm_pass.data, newpass, STR_ASCII);
+       arcfour_crypt(lm_pass.data, old_lm_hash, 516);
+       E_old_pw_hash(new_lm_hash, old_lm_hash, lm_verifier.hash);
+
+       r.in.server = &server;
+       r.in.account = &account;
+       r.in.password = &lm_pass;
+       r.in.hash = &lm_verifier;
+
+       status = dcerpc_samr_OemChangePasswordUser2(p, mem_ctx, &r);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) {
+               printf("OemChangePasswordUser2 returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status));
+       } else if (!NT_STATUS_IS_OK(status)) {
                printf("OemChangePasswordUser2 failed - %s\n", nt_errstr(status));
                ret = False;
        } else {
@@ -993,15 +1152,16 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
 
 
 static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                    const char *acct_name,
                                     struct policy_handle *handle, char **password)
 {
        NTSTATUS status;
        struct samr_ChangePasswordUser2 r;
        BOOL ret = True;
-       struct samr_Name server, account;
+       struct lsa_String server, account;
        struct samr_CryptPassword nt_pass, lm_pass;
        struct samr_Password nt_verifier, lm_verifier;
-       char *oldpass = *password;
+       char *oldpass;
        char *newpass;
        uint8_t old_nt_hash[16], new_nt_hash[16];
        uint8_t old_lm_hash[16], new_lm_hash[16];
@@ -1009,21 +1169,29 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct samr_GetDomPwInfo dom_pw_info;
        int policy_min_pw_len = 0;
 
-       struct samr_Name domain_name;
-       domain_name.name = "";
-       dom_pw_info.in.name = &domain_name;
+       struct lsa_String domain_name;
+
+
+       domain_name.string = "";
+       dom_pw_info.in.domain_name = &domain_name;
 
        printf("Testing ChangePasswordUser2\n");
 
+       if (!*password) {
+               printf("Failing ChangePasswordUser3 as old password was NULL.  Previous test failed?\n");
+               return False;
+       }
+       oldpass = *password;
+
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &dom_pw_info);
        if (NT_STATUS_IS_OK(status)) {
-               policy_min_pw_len = dom_pw_info.out.info.min_password_len;
+               policy_min_pw_len = dom_pw_info.out.info.min_password_length;
        }
 
        newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
 
-       server.name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       init_samr_Name(&account, TEST_ACCOUNT_NAME);
+       server.string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       init_lsa_String(&account, acct_name);
 
        E_md4hash(oldpass, old_nt_hash);
        E_md4hash(newpass, new_nt_hash);
@@ -1033,7 +1201,7 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        encode_pw_buffer(lm_pass.data, newpass, STR_ASCII|STR_TERMINATE);
        arcfour_crypt(lm_pass.data, old_lm_hash, 516);
-       E_old_pw_hash(new_lm_hash, old_lm_hash, lm_verifier.hash);
+       E_old_pw_hash(new_nt_hash, old_lm_hash, lm_verifier.hash);
 
        encode_pw_buffer(nt_pass.data, newpass, STR_UNICODE);
        arcfour_crypt(nt_pass.data, old_nt_hash, 516);
@@ -1048,7 +1216,9 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.lm_verifier = &lm_verifier;
 
        status = dcerpc_samr_ChangePasswordUser2(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
+       if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION)) {
+               printf("ChangePasswordUser2 returned: %s perhaps min password age? (not fatal)\n", nt_errstr(status));
+       } else if (!NT_STATUS_IS_OK(status)) {
                printf("ChangePasswordUser2 failed - %s\n", nt_errstr(status));
                ret = False;
        } else {
@@ -1059,26 +1229,45 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-static BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                                    struct policy_handle *handle, 
-                                    int policy_min_pw_len,
-                                    char **password)
+BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                             const char *account_string,
+                             int policy_min_pw_len,
+                             char **password,
+                             const char *newpass,
+                             NTTIME last_password_change,
+                             BOOL handle_reject_reason)
 {
        NTSTATUS status;
        struct samr_ChangePasswordUser3 r;
        BOOL ret = True;
-       struct samr_Name server, account;
+       struct lsa_String server, account, account_bad;
        struct samr_CryptPassword nt_pass, lm_pass;
        struct samr_Password nt_verifier, lm_verifier;
-       char *oldpass = *password;
-       char *newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);     
+       char *oldpass;
        uint8_t old_nt_hash[16], new_nt_hash[16];
        uint8_t old_lm_hash[16], new_lm_hash[16];
+       NTTIME t;
 
        printf("Testing ChangePasswordUser3\n");
 
-       server.name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       init_samr_Name(&account, TEST_ACCOUNT_NAME);
+       if (newpass == NULL) {
+               if (policy_min_pw_len == 0) {
+                       newpass = samr_rand_pass(mem_ctx, policy_min_pw_len);
+               } else {
+                       newpass = samr_rand_pass_fixed_len(mem_ctx, policy_min_pw_len);
+               }
+       } else {
+               printf("Using password '%s'\n", newpass);
+       }
+
+       if (!*password) {
+               printf("Failing ChangePasswordUser3 as old password was NULL.  Previous test failed?\n");
+               return False;
+       }
+
+       oldpass = *password;
+       server.string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       init_lsa_String(&account, account_string);
 
        E_md4hash(oldpass, old_nt_hash);
        E_md4hash(newpass, new_nt_hash);
@@ -1088,11 +1277,14 @@ static BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        encode_pw_buffer(lm_pass.data, newpass, STR_UNICODE);
        arcfour_crypt(lm_pass.data, old_nt_hash, 516);
-       E_old_pw_hash(new_lm_hash, old_lm_hash, lm_verifier.hash);
+       E_old_pw_hash(new_nt_hash, old_lm_hash, lm_verifier.hash);
 
        encode_pw_buffer(nt_pass.data, newpass, STR_UNICODE);
        arcfour_crypt(nt_pass.data, old_nt_hash, 516);
        E_old_pw_hash(new_nt_hash, old_nt_hash, nt_verifier.hash);
+       
+       /* Break the verification */
+       nt_verifier.hash[0]++;
 
        r.in.server = &server;
        r.in.account = &account;
@@ -1104,22 +1296,121 @@ static BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.password3 = NULL;
 
        status = dcerpc_samr_ChangePasswordUser3(p, mem_ctx, &r);
-       if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) 
-           && !policy_min_pw_len) {
-               if (r.out.dominfo) {
-                       policy_min_pw_len = r.out.dominfo->min_password_len;
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) &&
+           (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD))) {
+               printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD (or at least 'PASSWORD_RESTRICTON') for invalid password verifier - %s\n",
+                       nt_errstr(status));
+               ret = False;
+       }
+       
+       /* This shouldn't be a valid name */
+       init_lsa_String(&account_bad, talloc_asprintf(mem_ctx, "%sXX", account_string));
+
+       r.in.account = &account_bad;
+       status = dcerpc_samr_ChangePasswordUser3(p, mem_ctx, &r);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) {
+               printf("ChangePasswordUser3 failed, should have returned WRONG_PASSWORD for invalid username - %s\n",
+                       nt_errstr(status));
+               ret = False;
+       }
+
+       E_md4hash(oldpass, old_nt_hash);
+       E_md4hash(newpass, new_nt_hash);
+
+       E_deshash(oldpass, old_lm_hash);
+       E_deshash(newpass, new_lm_hash);
+
+       encode_pw_buffer(lm_pass.data, newpass, STR_UNICODE);
+       arcfour_crypt(lm_pass.data, old_nt_hash, 516);
+       E_old_pw_hash(new_nt_hash, old_lm_hash, lm_verifier.hash);
+
+       encode_pw_buffer(nt_pass.data, newpass, STR_UNICODE);
+       arcfour_crypt(nt_pass.data, old_nt_hash, 516);
+       E_old_pw_hash(new_nt_hash, old_nt_hash, nt_verifier.hash);
+
+       r.in.server = &server;
+       r.in.account = &account;
+       r.in.nt_password = &nt_pass;
+       r.in.nt_verifier = &nt_verifier;
+       r.in.lm_change = 1;
+       r.in.lm_password = &lm_pass;
+       r.in.lm_verifier = &lm_verifier;
+       r.in.password3 = NULL;
+
+       unix_to_nt_time(&t, time(NULL));
+
+       status = dcerpc_samr_ChangePasswordUser3(p, mem_ctx, &r);
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) && 
+          r.out.dominfo && r.out.reject && handle_reject_reason) {
+
+               if (r.out.dominfo->password_properties & DOMAIN_REFUSE_PASSWORD_CHANGE ) {
+
+                       if (r.out.reject && (r.out.reject->reason != SAMR_REJECT_OTHER)) {
+                               printf("expected SAMR_REJECT_OTHER (%d), got %d\n", 
+                                       SAMR_REJECT_OTHER, r.out.reject->reason);
+                               return False;
+                       }
                }
-               if (policy_min_pw_len) /* try again with the right min password length */ {
-                       ret = test_ChangePasswordUser3(p, mem_ctx, handle, policy_min_pw_len, password);
-               } else {
-                       printf("ChangePasswordUser3 failed - %s\n", nt_errstr(status));
-                       ret = False;
+
+               /* We tested the order of precendence which is as follows:
+               
+               * pwd min_age 
+               * pwd length
+               * pwd complexity
+               * pwd history
+
+               Guenther */
+
+               if ((r.out.dominfo->min_password_age > 0) && !null_nttime(last_password_change) && 
+                          (last_password_change + r.out.dominfo->min_password_age > t)) {
+
+                       if (r.out.reject->reason != SAMR_REJECT_OTHER) {
+                               printf("expected SAMR_REJECT_OTHER (%d), got %d\n", 
+                                       SAMR_REJECT_OTHER, r.out.reject->reason);
+                               return False;
+                       }
+
+               } else if ((r.out.dominfo->min_password_length > 0) && 
+                          (strlen(newpass) < r.out.dominfo->min_password_length)) {
+
+                       if (r.out.reject->reason != SAMR_REJECT_TOO_SHORT) {
+                               printf("expected SAMR_REJECT_TOO_SHORT (%d), got %d\n", 
+                                       SAMR_REJECT_TOO_SHORT, r.out.reject->reason);
+                               return False;
+                       }
+
+               } else if (r.out.dominfo->password_properties & DOMAIN_PASSWORD_COMPLEX) {
+
+                       if (r.out.reject->reason != SAMR_REJECT_COMPLEXITY) {
+                               printf("expected SAMR_REJECT_COMPLEXITY (%d), got %d\n", 
+                                       SAMR_REJECT_COMPLEXITY, r.out.reject->reason);
+                               return False;
+                       }
+
+               } else if ((r.out.dominfo->password_history_length > 0) && 
+                           strequal(oldpass, newpass)) {
+
+                       if (r.out.reject->reason != SAMR_REJECT_IN_HISTORY) {
+                               printf("expected SAMR_REJECT_IN_HISTORY (%d), got %d\n", 
+                                       SAMR_REJECT_IN_HISTORY, r.out.reject->reason);
+                               return False;
+                       }
                }
+
+               if (r.out.reject->reason == SAMR_REJECT_TOO_SHORT) {
+                       /* retry with adjusted size */
+                       return test_ChangePasswordUser3(p, mem_ctx, account_string, 
+                                                       r.out.dominfo->min_password_length, 
+                                                       password, NULL, 0, False); 
+
+               }
+
        } else if (!NT_STATUS_IS_OK(status)) {
                printf("ChangePasswordUser3 failed - %s\n", nt_errstr(status));
                ret = False;
        } else {
-               *password = newpass;
+               *password = talloc_strdup(mem_ctx, newpass);
        }
 
        return ret;
@@ -1197,7 +1488,7 @@ static BOOL test_AddMultipleMembersToAlias(struct dcerpc_pipe *p, TALLOC_CTX *me
        a.in.sids = &sids;
 
        sids.num_sids = 3;
-       sids.sids = talloc_array_p(mem_ctx, struct lsa_SidPtr, 3);
+       sids.sids = talloc_array(mem_ctx, struct lsa_SidPtr, 3);
 
        sids.sids[0].sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-1-2-3-1");
        sids.sids[1].sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-1-2-3-2");
@@ -1261,34 +1552,91 @@ static BOOL test_TestPrivateFunctionsUser(struct dcerpc_pipe *p, TALLOC_CTX *mem
 
 
 static BOOL test_user_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                         struct policy_handle *handle, uint32_t base_acct_flags)
+                         struct policy_handle *user_handle, 
+                         struct policy_handle *domain_handle, 
+                         uint32_t base_acct_flags, 
+                         const char *base_acct_name, enum torture_samr_choice which_ops)
 {
+       TALLOC_CTX *user_ctx;
+       char *password = NULL;
+
        BOOL ret = True;
+       int i;
+       const uint32_t password_fields[] = {
+               SAMR_FIELD_PASSWORD,
+               SAMR_FIELD_PASSWORD2,
+               SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2,
+               0
+       };
+       
+       user_ctx = talloc_named(mem_ctx, 0, "test_user_ops per-user context");
+       switch (which_ops) {
+       case TORTURE_SAMR_USER_ATTRIBUTES:
+               if (!test_QuerySecurity(p, user_ctx, user_handle)) {
+                       ret = False;
+               }
 
-       if (!test_QuerySecurity(p, mem_ctx, handle)) {
-               ret = False;
-       }
+               if (!test_QueryUserInfo(p, user_ctx, user_handle)) {
+                       ret = False;
+               }
 
-       if (!test_QueryUserInfo(p, mem_ctx, handle)) {
-               ret = False;
-       }
+               if (!test_QueryUserInfo2(p, user_ctx, user_handle)) {
+                       ret = False;
+               }
 
-       if (!test_QueryUserInfo2(p, mem_ctx, handle)) {
-               ret = False;
-       }
+               if (!test_SetUserInfo(p, user_ctx, user_handle, base_acct_flags,
+                                     base_acct_name)) {
+                       ret = False;
+               }       
 
-       if (!test_SetUserInfo(p, mem_ctx, handle, base_acct_flags)) {
-               ret = False;
-       }       
+               if (!test_GetUserPwInfo(p, user_ctx, user_handle)) {
+                       ret = False;
+               }
 
-       if (!test_GetUserPwInfo(p, mem_ctx, handle)) {
-               ret = False;
-       }
+               if (!test_TestPrivateFunctionsUser(p, user_ctx, user_handle)) {
+                       ret = False;
+               }
 
-       if (!test_TestPrivateFunctionsUser(p, mem_ctx, handle)) {
-               ret = False;
-       }
+               if (!test_SetUserPass(p, user_ctx, user_handle, &password)) {
+                       ret = False;
+               }
+               break;
+       case TORTURE_SAMR_PASSWORDS:
+               for (i = 0; password_fields[i]; i++) {
+                       if (!test_SetUserPass_23(p, user_ctx, user_handle, password_fields[i], &password)) {
+                               ret = False;
+                       }       
+               
+                       /* check it was set right */
+                       if (!test_ChangePasswordUser3(p, user_ctx, base_acct_name, 0, &password, NULL, 0, False)) {
+                               ret = False;
+                       }
+               }               
+
+               for (i = 0; password_fields[i]; i++) {
+                       if (!test_SetUserPass_25(p, user_ctx, user_handle, password_fields[i], &password)) {
+                               ret = False;
+                       }       
+               
+                       /* check it was set right */
+                       if (!test_ChangePasswordUser3(p, user_ctx, base_acct_name, 0, &password, NULL, 0, False)) {
+                               ret = False;
+                       }
+               }               
 
+               if (!test_SetUserPassEx(p, user_ctx, user_handle, &password)) {
+                       ret = False;
+               }       
+
+               if (!test_ChangePassword(p, user_ctx, base_acct_name, domain_handle, &password)) {
+                       ret = False;
+               }       
+               break;
+       case TORTURE_SAMR_OTHER:
+               /* We just need the account to exist */
+               break;
+       }
+       talloc_free(user_ctx);
        return ret;
 }
 
@@ -1314,6 +1662,11 @@ static BOOL test_alias_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping MultipleMembers Alias tests against Samba4\n");
+               return ret;
+       }
+
        if (!test_AddMultipleMembersToAlias(p, mem_ctx, alias_handle)) {
                ret = False;
        }
@@ -1322,6 +1675,26 @@ static BOOL test_alias_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
+static BOOL test_DeleteUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                                    struct policy_handle *user_handle)
+{
+       struct samr_DeleteUser d;
+       NTSTATUS status;
+       BOOL ret = True;
+       printf("Testing DeleteUser\n");
+
+       d.in.user_handle = user_handle;
+       d.out.user_handle = user_handle;
+
+       status = dcerpc_samr_DeleteUser(p, mem_ctx, &d);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("DeleteUser failed - %s\n", nt_errstr(status));
+               ret = False;
+       }
+
+       return ret;
+}
+
 BOOL test_DeleteUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                            struct policy_handle *handle, const char *name)
 {
@@ -1370,7 +1743,7 @@ static BOOL test_DeleteGroup_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        r.in.domain_handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.group_handle = &group_handle;
        status = dcerpc_samr_OpenGroup(p, mem_ctx, &r);
@@ -1410,7 +1783,7 @@ static BOOL test_DeleteAlias_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        r.in.domain_handle = domain_handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.alias_handle = &alias_handle;
        status = dcerpc_samr_OpenAlias(p, mem_ctx, &r);
@@ -1428,7 +1801,7 @@ static BOOL test_DeleteAlias_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        return True;
 
 failed:
-       printf("DeleteUser_byname(%s) failed - %s\n", name, nt_errstr(status));
+       printf("DeleteAlias_byname(%s) failed - %s\n", name, nt_errstr(status));
        return False;
 }
 
@@ -1459,28 +1832,28 @@ static BOOL test_CreateAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
        NTSTATUS status;
        struct samr_CreateDomAlias r;
-       struct samr_Name name;
+       struct lsa_String name;
        uint32_t rid;
        BOOL ret = True;
 
-       init_samr_Name(&name, TEST_ALIASNAME);
+       init_lsa_String(&name, TEST_ALIASNAME);
        r.in.domain_handle = domain_handle;
-       r.in.aliasname = &name;
-       r.in.access_mask = SEC_RIGHT_MAXIMUM_ALLOWED;
+       r.in.alias_name = &name;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.alias_handle = alias_handle;
        r.out.rid = &rid;
 
-       printf("Testing CreateAlias (%s)\n", r.in.aliasname->name);
+       printf("Testing CreateAlias (%s)\n", r.in.alias_name->string);
 
        status = dcerpc_samr_CreateDomAlias(p, mem_ctx, &r);
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
-               printf("Server refused create of '%s'\n", r.in.aliasname->name);
+               printf("Server refused create of '%s'\n", r.in.alias_name->string);
                return True;
        }
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_ALIAS_EXISTS)) {
-               if (!test_DeleteAlias_byname(p, mem_ctx, domain_handle, r.in.aliasname->name)) {
+               if (!test_DeleteAlias_byname(p, mem_ctx, domain_handle, r.in.alias_name->string)) {
                        return False;
                }
                status = dcerpc_samr_CreateDomAlias(p, mem_ctx, &r);
@@ -1499,6 +1872,7 @@ static BOOL test_CreateAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_ChangePassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                               const char *acct_name,
                                struct policy_handle *domain_handle, char **password)
 {
        BOOL ret = True;
@@ -1507,25 +1881,138 @@ static BOOL test_ChangePassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       if (!test_ChangePasswordUser(p, mem_ctx, domain_handle, password)) {
+       if (!test_ChangePasswordUser(p, mem_ctx, acct_name, domain_handle, password)) {
+               ret = False;
+       }
+
+       if (!test_ChangePasswordUser2(p, mem_ctx, acct_name, domain_handle, password)) {
                ret = False;
        }
 
-       if (!test_ChangePasswordUser2(p, mem_ctx, domain_handle, password)) {
+       if (!test_OemChangePasswordUser2(p, mem_ctx, acct_name, domain_handle, password)) {
                ret = False;
        }
 
-       if (!test_OemChangePasswordUser2(p, mem_ctx, domain_handle, password)) {
+       /* test what happens when setting the old password again */
+       if (!test_ChangePasswordUser3(p, mem_ctx, acct_name, 0, password, *password, 0, True)) {
                ret = False;
        }
 
+       {
+               char simple_pass[9];
+               char *v = generate_random_str(mem_ctx, 1);
+
+               ZERO_STRUCT(simple_pass);
+               memset(simple_pass, *v, sizeof(simple_pass) - 1);
+
+               /* test what happens when picking a simple password */
+               if (!test_ChangePasswordUser3(p, mem_ctx, acct_name, 0, password, simple_pass, 0, True)) {
+                       ret = False;
+               }
+       }
+
+       /* set samr_SetDomainInfo level 1 with min_length 5 */
+       {
+               struct samr_QueryDomainInfo r;
+               struct samr_SetDomainInfo s;
+               uint16_t len_old, len;
+               NTSTATUS status;
+
+               len = 3;
+
+               r.in.domain_handle = domain_handle;
+               r.in.level = 1;
+
+               printf("testing samr_QueryDomainInfo level 1\n");
+               status = dcerpc_samr_QueryDomainInfo(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return False;
+               }
+
+               s.in.domain_handle = domain_handle;
+               s.in.level = 1;
+               s.in.info = r.out.info;
+
+               len_old = s.in.info->info1.min_password_length;
+               s.in.info->info1.min_password_length = len;
+
+               printf("testing samr_SetDomainInfo level 1\n");
+               status = dcerpc_samr_SetDomainInfo(p, mem_ctx, &s);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return False;
+               }
+
+               printf("calling test_ChangePasswordUser3 with too short password\n");
+
+               if (!test_ChangePasswordUser3(p, mem_ctx, acct_name, len - 1, password, NULL, 0, True)) {
+                       ret = False;
+               }
+
+               s.in.info->info1.min_password_length = len_old;
+               
+               printf("testing samr_SetDomainInfo level 1\n");
+               status = dcerpc_samr_SetDomainInfo(p, mem_ctx, &s);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return False;
+               }
+
+       }
+
+       {
+               NTSTATUS status;
+               struct samr_OpenUser r;
+               struct samr_QueryUserInfo q;
+               struct samr_LookupNames n;
+               struct policy_handle user_handle;
+
+               n.in.domain_handle = domain_handle;
+               n.in.num_names = 1;
+               n.in.names = talloc_array(mem_ctx, struct lsa_String, 1);
+               n.in.names[0].string = acct_name; 
+
+               status = dcerpc_samr_LookupNames(p, mem_ctx, &n);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("LookupNames failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+
+               r.in.domain_handle = domain_handle;
+               r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+               r.in.rid = n.out.rids.ids[0];
+               r.out.user_handle = &user_handle;
+
+               status = dcerpc_samr_OpenUser(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("OpenUser(%u) failed - %s\n", n.out.rids.ids[0], nt_errstr(status));
+                       return False;
+               }
+
+               q.in.user_handle = &user_handle;
+               q.in.level = 5;
+
+               status = dcerpc_samr_QueryUserInfo(p, mem_ctx, &q);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QueryUserInfo failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+
+               printf("calling test_ChangePasswordUser3 with too early password change\n");
+
+               if (!test_ChangePasswordUser3(p, mem_ctx, acct_name, 0, password, NULL, 
+                                             q.out.info->info5.last_password_change, True)) {
+                       ret = False;
+               }
+       }
+
+       return True;
+
        /* we change passwords twice - this has the effect of verifying
           they were changed correctly for the final call */
-       if (!test_ChangePasswordUser3(p, mem_ctx, domain_handle, 0, password)) {
+       if (!test_ChangePasswordUser3(p, mem_ctx, acct_name, 0, password, NULL, 0, True)) {
                ret = False;
        }
 
-       if (!test_ChangePasswordUser3(p, mem_ctx, domain_handle, 0, password)) {
+       if (!test_ChangePasswordUser3(p, mem_ctx, acct_name, 0, password, NULL, 0, True)) {
                ret = False;
        }
 
@@ -1533,138 +2020,103 @@ static BOOL test_ChangePassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *domain_handle, struct policy_handle *user_handle)
+                           struct policy_handle *domain_handle, 
+                           struct policy_handle *user_handle_out, 
+                           enum torture_samr_choice which_ops)
 {
+
+       TALLOC_CTX *user_ctx;
+
        NTSTATUS status;
        struct samr_CreateUser r;
        struct samr_QueryUserInfo q;
+       struct samr_DeleteUser d;
        uint32_t rid;
-       char *password = NULL;
-
-       int i;
-       const uint32 password_fields[] = {
-               SAMR_FIELD_PASSWORD,
-               SAMR_FIELD_PASSWORD2,
-               SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2,
-               0
-       };
 
        /* This call creates a 'normal' account - check that it really does */
        const uint32_t acct_flags = ACB_NORMAL;
-       struct samr_Name name;
+       struct lsa_String name;
        BOOL ret = True;
 
-       init_samr_Name(&name, TEST_ACCOUNT_NAME);
+       struct policy_handle user_handle;
+       user_ctx = talloc_named(mem_ctx, 0, "test_CreateUser2 per-user context");
+       init_lsa_String(&name, TEST_ACCOUNT_NAME);
 
        r.in.domain_handle = domain_handle;
        r.in.account_name = &name;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       r.out.user_handle = user_handle;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       r.out.user_handle = &user_handle;
        r.out.rid = &rid;
 
-       printf("Testing CreateUser(%s)\n", r.in.account_name->name);
+       printf("Testing CreateUser(%s)\n", r.in.account_name->string);
 
-       status = dcerpc_samr_CreateUser(p, mem_ctx, &r);
+       status = dcerpc_samr_CreateUser(p, user_ctx, &r);
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
-               printf("Server refused create of '%s'\n", r.in.account_name->name);
-               ZERO_STRUCTP(user_handle);
+               printf("Server refused create of '%s': %s\n", r.in.account_name->string, nt_errstr(status));
+               talloc_free(user_ctx);
                return True;
        }
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
-               if (!test_DeleteUser_byname(p, mem_ctx, domain_handle, r.in.account_name->name)) {
+               if (!test_DeleteUser_byname(p, user_ctx, domain_handle, r.in.account_name->string)) {
+                       talloc_free(user_ctx);
                        return False;
                }
-               status = dcerpc_samr_CreateUser(p, mem_ctx, &r);
+               status = dcerpc_samr_CreateUser(p, user_ctx, &r);
        }
        if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(user_ctx);
                printf("CreateUser failed - %s\n", nt_errstr(status));
                return False;
-       }
-
-       q.in.user_handle = user_handle;
-       q.in.level = 16;
-
-       status = dcerpc_samr_QueryUserInfo(p, mem_ctx, &q);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("QueryUserInfo level %u failed - %s\n", 
-                      q.in.level, nt_errstr(status));
-               ret = False;
        } else {
-               if ((q.out.info->info16.acct_flags & acct_flags) != acct_flags) {
-                       printf("QuerUserInfo level 16 failed, it returned 0x%08x (%u) when we expected flags of 0x%08x (%u)\n",
-                              q.out.info->info16.acct_flags, q.out.info->info16.acct_flags, 
-                              acct_flags, acct_flags);
+               q.in.user_handle = &user_handle;
+               q.in.level = 16;
+               
+               status = dcerpc_samr_QueryUserInfo(p, user_ctx, &q);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("QueryUserInfo level %u failed - %s\n", 
+                              q.in.level, nt_errstr(status));
                        ret = False;
+               } else {
+                       if ((q.out.info->info16.acct_flags & acct_flags) != acct_flags) {
+                               printf("QuerUserInfo level 16 failed, it returned 0x%08x when we expected flags of 0x%08x\n",
+                                      q.out.info->info16.acct_flags, 
+                                      acct_flags);
+                               ret = False;
+                       }
                }
-       }
-
-       if (!test_user_ops(p, mem_ctx, user_handle, acct_flags)) {
-               ret = False;
-       }
-
-       if (!test_SetUserPass(p, mem_ctx, user_handle, &password)) {
-               ret = False;
-       }       
-
-       for (i = 0; password_fields[i]; i++) {
-               if (!test_SetUserPass_23(p, mem_ctx, user_handle, password_fields[i], &password)) {
-                       ret = False;
-               }       
                
-               /* check it was set right */
-               if (!test_ChangePasswordUser3(p, mem_ctx, domain_handle, 0, &password)) {
+               if (!test_user_ops(p, user_ctx, &user_handle, domain_handle, 
+                                  acct_flags, name.string, which_ops)) {
                        ret = False;
                }
-       }               
-
-       for (i = 0; password_fields[i]; i++) {
-               if (!test_SetUserPass_25(p, mem_ctx, user_handle, password_fields[i], &password)) {
-                       ret = False;
-               }       
                
-               /* check it was set right */
-               if (!test_ChangePasswordUser3(p, mem_ctx, domain_handle, 0, &password)) {
-                       ret = False;
+               if (user_handle_out) {
+                       *user_handle_out = user_handle;
+               } else {
+                       printf("Testing DeleteUser (createuser test)\n");
+                       
+                       d.in.user_handle = &user_handle;
+                       d.out.user_handle = &user_handle;
+                       
+                       status = dcerpc_samr_DeleteUser(p, user_ctx, &d);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("DeleteUser failed - %s\n", nt_errstr(status));
+                               ret = False;
+                       }
                }
-       }               
-
-       if (!test_SetUserPassEx(p, mem_ctx, user_handle, &password)) {
-               ret = False;
-       }       
-
-       if (!test_ChangePassword(p, mem_ctx, domain_handle, &password)) {
-               ret = False;
-       }       
-
-       return ret;
-}
-
-
-static BOOL test_DeleteUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *user_handle)
-{
-       struct samr_DeleteUser d;
-       NTSTATUS status;
-       BOOL ret = True;
-
-       printf("Testing DeleteUser\n");
-
-       d.in.user_handle = user_handle;
-       d.out.user_handle = user_handle;
-
-       status = dcerpc_samr_DeleteUser(p, mem_ctx, &d);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("DeleteUser failed - %s\n", nt_errstr(status));
-               ret = False;
+               
        }
 
+       talloc_free(user_ctx);
+       
        return ret;
 }
 
+
 static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                            struct policy_handle *handle)
+                            struct policy_handle *domain_handle, enum torture_samr_choice which_ops)
 {
        NTSTATUS status;
        struct samr_CreateUser2 r;
@@ -1672,7 +2124,7 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct samr_DeleteUser d;
        struct policy_handle user_handle;
        uint32_t rid;
-       struct samr_Name name;
+       struct lsa_String name;
        BOOL ret = True;
        int i;
 
@@ -1699,32 +2151,36 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        };
 
        for (i = 0; account_types[i].account_name; i++) {
+               TALLOC_CTX *user_ctx;
                uint32_t acct_flags = account_types[i].acct_flags;
                uint32_t access_granted;
+               user_ctx = talloc_named(mem_ctx, 0, "test_CreateUser2 per-user context");
+               init_lsa_String(&name, account_types[i].account_name);
 
-               init_samr_Name(&name, account_types[i].account_name);
-
-               r.in.domain_handle = handle;
+               r.in.domain_handle = domain_handle;
                r.in.account_name = &name;
                r.in.acct_flags = acct_flags;
-               r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+               r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
                r.out.user_handle = &user_handle;
                r.out.access_granted = &access_granted;
                r.out.rid = &rid;
                
-               printf("Testing CreateUser2(%s, 0x%x)\n", r.in.account_name->name, acct_flags);
+               printf("Testing CreateUser2(%s, 0x%x)\n", r.in.account_name->string, acct_flags);
                
-               status = dcerpc_samr_CreateUser2(p, mem_ctx, &r);
+               status = dcerpc_samr_CreateUser2(p, user_ctx, &r);
                
                if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
-                       printf("Server refused create of '%s'\n", r.in.account_name->name);
+                       talloc_free(user_ctx);
+                       printf("Server refused create of '%s'\n", r.in.account_name->string);
                        continue;
 
                } else if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
-                       if (!test_DeleteUser_byname(p, mem_ctx, handle, r.in.account_name->name)) {
-                               return False;
+                       if (!test_DeleteUser_byname(p, user_ctx, domain_handle, r.in.account_name->string)) {
+                               talloc_free(user_ctx);
+                               ret = False;
+                               continue;
                        }
-                       status = dcerpc_samr_CreateUser2(p, mem_ctx, &r);
+                       status = dcerpc_samr_CreateUser2(p, user_ctx, &r);
 
                }
                if (!NT_STATUS_EQUAL(status, account_types[i].nt_status)) {
@@ -1737,7 +2193,7 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        q.in.user_handle = &user_handle;
                        q.in.level = 16;
                        
-                       status = dcerpc_samr_QueryUserInfo(p, mem_ctx, &q);
+                       status = dcerpc_samr_QueryUserInfo(p, user_ctx, &q);
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("QueryUserInfo level %u failed - %s\n", 
                                       q.in.level, nt_errstr(status));
@@ -1751,7 +2207,8 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                                }
                        }
                
-                       if (!test_user_ops(p, mem_ctx, &user_handle, acct_flags)) {
+                       if (!test_user_ops(p, user_ctx, &user_handle, domain_handle, 
+                                          acct_flags, name.string, which_ops)) {
                                ret = False;
                        }
 
@@ -1760,12 +2217,13 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        d.in.user_handle = &user_handle;
                        d.out.user_handle = &user_handle;
                        
-                       status = dcerpc_samr_DeleteUser(p, mem_ctx, &d);
+                       status = dcerpc_samr_DeleteUser(p, user_ctx, &d);
                        if (!NT_STATUS_IS_OK(status)) {
                                printf("DeleteUser failed - %s\n", nt_errstr(status));
                                ret = False;
                        }
                }
+               talloc_free(user_ctx);
        }
 
        return ret;
@@ -1880,12 +2338,12 @@ static BOOL test_SetGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                   the name is still reserved, so creating the old name fails, but deleting by the old name
                   also fails */
                if (s.in.level == 2) {
-                       init_samr_Name(&s.in.info->name, "NewName");
+                       init_lsa_String(&s.in.info->string, "NewName");
                }
 #endif
 
                if (s.in.level == 4) {
-                       init_samr_Name(&s.in.info->description, "test description");
+                       init_lsa_String(&s.in.info->description, "test description");
                }
 
                status = dcerpc_samr_SetGroupInfo(p, mem_ctx, &s);
@@ -1974,7 +2432,7 @@ static BOOL test_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("Testing OpenUser(%u)\n", rid);
 
        r.in.domain_handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.user_handle = &user_handle;
 
@@ -2004,7 +2462,7 @@ static BOOL test_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       if (!test_Close(p, mem_ctx, &user_handle)) {
+       if (!test_samr_handle_Close(p, mem_ctx, &user_handle)) {
                ret = False;
        }
 
@@ -2022,7 +2480,7 @@ static BOOL test_OpenGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("Testing OpenGroup(%u)\n", rid);
 
        r.in.domain_handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.group_handle = &group_handle;
 
@@ -2044,7 +2502,7 @@ static BOOL test_OpenGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       if (!test_Close(p, mem_ctx, &group_handle)) {
+       if (!test_samr_handle_Close(p, mem_ctx, &group_handle)) {
                ret = False;
        }
 
@@ -2062,7 +2520,7 @@ static BOOL test_OpenAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("Testing OpenAlias(%u)\n", rid);
 
        r.in.domain_handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.alias_handle = &alias_handle;
 
@@ -2084,7 +2542,7 @@ static BOOL test_OpenAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       if (!test_Close(p, mem_ctx, &alias_handle)) {
+       if (!test_samr_handle_Close(p, mem_ctx, &alias_handle)) {
                ret = False;
        }
 
@@ -2133,9 +2591,9 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("Testing LookupNames\n");
        n.in.domain_handle = handle;
        n.in.num_names = r.out.sam->count;
-       n.in.names = talloc(mem_ctx, r.out.sam->count * sizeof(struct samr_Name));
+       n.in.names = talloc_array(mem_ctx, struct lsa_String, r.out.sam->count);
        for (i=0;i<r.out.sam->count;i++) {
-               n.in.names[i] = r.out.sam->entries[i].name;
+               n.in.names[i].string = r.out.sam->entries[i].name.string;
        }
        status = dcerpc_samr_LookupNames(p, mem_ctx, &n);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2147,7 +2605,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("Testing LookupRids\n");
        lr.in.domain_handle = handle;
        lr.in.num_rids = r.out.sam->count;
-       lr.in.rids = talloc(mem_ctx, r.out.sam->count * sizeof(uint32_t));
+       lr.in.rids = talloc_array(mem_ctx, uint32_t, r.out.sam->count);
        for (i=0;i<r.out.sam->count;i++) {
                lr.in.rids[i] = r.out.sam->entries[i].idx;
        }
@@ -2173,7 +2631,7 @@ static BOOL test_EnumDomainUsers_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ct
 #define ASYNC_COUNT 100
        struct rpc_request *req[ASYNC_COUNT];
 
-       if (lp_parm_int(-1, "torture", "dangerous") != 1) {
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
                printf("samr async test disabled - enable dangerous tests to use\n");
                return True;
        }
@@ -2289,7 +2747,7 @@ static BOOL test_GetDisplayEnumerationIndex(struct dcerpc_pipe *p, TALLOC_CTX *m
 
                r.in.domain_handle = handle;
                r.in.level = levels[i];
-               init_samr_Name(&r.in.name, TEST_ACCOUNT_NAME);
+               init_lsa_String(&r.in.name, TEST_ACCOUNT_NAME);
 
                status = dcerpc_samr_GetDisplayEnumerationIndex(p, mem_ctx, &r);
 
@@ -2301,7 +2759,7 @@ static BOOL test_GetDisplayEnumerationIndex(struct dcerpc_pipe *p, TALLOC_CTX *m
                        ret = False;
                }
 
-               init_samr_Name(&r.in.name, "zzzzzzzz");
+               init_lsa_String(&r.in.name, "zzzzzzzz");
 
                status = dcerpc_samr_GetDisplayEnumerationIndex(p, mem_ctx, &r);
                
@@ -2330,7 +2788,7 @@ static BOOL test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX *
 
                r.in.domain_handle = handle;
                r.in.level = levels[i];
-               init_samr_Name(&r.in.name, TEST_ACCOUNT_NAME);
+               init_lsa_String(&r.in.name, TEST_ACCOUNT_NAME);
 
                status = dcerpc_samr_GetDisplayEnumerationIndex2(p, mem_ctx, &r);
                if (ok_lvl[i] && 
@@ -2341,7 +2799,7 @@ static BOOL test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX *
                        ret = False;
                }
 
-               init_samr_Name(&r.in.name, "zzzzzzzz");
+               init_lsa_String(&r.in.name, "zzzzzzzz");
 
                status = dcerpc_samr_GetDisplayEnumerationIndex2(p, mem_ctx, &r);
                if (ok_lvl[i] && !NT_STATUS_EQUAL(NT_STATUS_NO_MORE_ENTRIES, status)) {
@@ -2441,6 +2899,47 @@ static BOOL test_QueryDisplayInfo3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        return ret;     
 }
 
+
+static BOOL test_QueryDisplayInfo_continue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+                                          struct policy_handle *handle)
+{
+       NTSTATUS status;
+       struct samr_QueryDisplayInfo r;
+       BOOL ret = True;
+
+       printf("Testing QueryDisplayInfo continuation\n");
+
+       r.in.domain_handle = handle;
+       r.in.level = 1;
+       r.in.start_idx = 0;
+       r.in.max_entries = 1;
+       r.in.buf_size = (uint32_t)-1;
+
+       do {
+               status = dcerpc_samr_QueryDisplayInfo(p, mem_ctx, &r);
+               if (NT_STATUS_IS_OK(status) && r.out.returned_size != 0) {
+                       if (r.out.info.info1.entries[0].idx != r.in.start_idx + 1) {
+                               printf("expected idx %d but got %d\n",
+                                      r.in.start_idx + 1,
+                                      r.out.info.info1.entries[0].idx);
+                               break;
+                       }
+               }
+               if (!NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES) &&
+                   !NT_STATUS_IS_OK(status)) {
+                       printf("QueryDisplayInfo level %u failed - %s\n", 
+                              r.in.level, nt_errstr(status));
+                       ret = False;
+                       break;
+               }
+               r.in.start_idx++;
+       } while ((NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES) ||
+                 NT_STATUS_IS_OK(status)) &&
+                r.out.returned_size != 0);
+       
+       return ret;     
+}
+
 static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                                 struct policy_handle *handle)
 {
@@ -2451,6 +2950,21 @@ static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        uint16_t set_ok[] = {1, 0, 1, 1, 0, 1, 1, 0, 1,  0,  1,  0};
        int i;
        BOOL ret = True;
+       const char *domain_comment = talloc_asprintf(mem_ctx, 
+                                 "Tortured by Samba4 RPC-SAMR: %s", 
+                                 timestring(mem_ctx, time(NULL)));
+
+       s.in.domain_handle = handle;
+       s.in.level = 4;
+       s.in.info = talloc(mem_ctx, union samr_DomainInfo);
+       
+       s.in.info->info4.comment.string = domain_comment;
+       status = dcerpc_samr_SetDomainInfo(p, mem_ctx, &s);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("SetDomainInfo level %u (set comment) failed - %s\n", 
+                      r.in.level, nt_errstr(status));
+               return False;
+       }
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                printf("Testing QueryDomainInfo level %u\n", levels[i]);
@@ -2466,6 +2980,47 @@ static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        continue;
                }
 
+               switch (levels[i]) {
+               case 2:
+                       if (strcmp(r.out.info->info2.comment.string, domain_comment) != 0) {
+                               printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
+                                      levels[i], r.out.info->info2.comment.string, domain_comment);
+                               ret = False;
+                       }
+                       if (!r.out.info->info2.primary.string) {
+                               printf("QueryDomainInfo level %u returned no PDC name\n",
+                                      levels[i]);
+                               ret = False;
+                       } else if (r.out.info->info2.role == SAMR_ROLE_DOMAIN_PDC) {
+                               if (dcerpc_server_name(p) && strcasecmp_m(dcerpc_server_name(p), r.out.info->info2.primary.string) != 0) {
+                                       printf("QueryDomainInfo level %u returned different PDC name (%s) compared to server name (%s), despite claiming to be the PDC\n",
+                                              levels[i], r.out.info->info2.primary.string, dcerpc_server_name(p));
+                               }
+                       }
+                       break;
+               case 4:
+                       if (strcmp(r.out.info->info4.comment.string, domain_comment) != 0) {
+                               printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
+                                      levels[i], r.out.info->info4.comment.string, domain_comment);
+                               ret = False;
+                       }
+                       break;
+               case 6:
+                       if (!r.out.info->info6.primary.string) {
+                               printf("QueryDomainInfo level %u returned no PDC name\n",
+                                      levels[i]);
+                               ret = False;
+                       }
+                       break;
+               case 11:
+                       if (strcmp(r.out.info->info11.info2.comment.string, domain_comment) != 0) {
+                               printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
+                                      levels[i], r.out.info->info11.info2.comment.string, domain_comment);
+                               ret = False;
+                       }
+                       break;
+               }
+
                printf("Testing SetDomainInfo level %u\n", levels[i]);
 
                s.in.domain_handle = handle;
@@ -2498,7 +3053,7 @@ static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                }
        }
 
-       return True;    
+       return ret;     
 }
 
 
@@ -2559,9 +3114,9 @@ static BOOL test_GroupList(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                    !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES))
                        break;
 
-               for (i=0; i<q1.out.sam->count; i++) {
+               for (i=0; i<q1.out.num_entries; i++) {
                        add_string_to_array(mem_ctx,
-                                           q1.out.sam->entries[i].name.name,
+                                           q1.out.sam->entries[i].name.string,
                                            &names, &num_names);
                }
        }
@@ -2591,7 +3146,7 @@ static BOOL test_GroupList(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
                for (i=0; i<q2.out.info.info5.count; i++) {
                        int j;
-                       const char *name = q2.out.info.info5.entries[i].account_name.name;
+                       const char *name = q2.out.info.info5.entries[i].account_name.string;
                        BOOL found = False;
                        for (j=0; j<num_names; j++) {
                                if (names[j] == NULL)
@@ -2672,21 +3227,38 @@ static BOOL test_TestPrivateFunctionsDomain(struct dcerpc_pipe *p, TALLOC_CTX *m
 }
 
 static BOOL test_RidToSid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                         struct dom_sid *domain_sid,
                          struct policy_handle *domain_handle)
 {
        struct samr_RidToSid r;
        NTSTATUS status;
        BOOL ret = True;
+       struct dom_sid *calc_sid;
+       int rids[] = { 0, 42, 512, 10200 };
+       int i;
 
-       printf("Testing RidToSid\n");
-
-       r.in.domain_handle = domain_handle;
-       r.in.rid = 512;
+       for (i=0;i<ARRAY_SIZE(rids);i++) {
+       
+               printf("Testing RidToSid\n");
+               
+               calc_sid = dom_sid_dup(mem_ctx, domain_sid);
+               r.in.domain_handle = domain_handle;
+               r.in.rid = rids[i];
+               
+               status = dcerpc_samr_RidToSid(p, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("RidToSid for %d failed - %s\n", rids[i], nt_errstr(status));
+                       ret = False;
+               } else {
+                       calc_sid = dom_sid_add_rid(calc_sid, calc_sid, rids[i]);
 
-       status = dcerpc_samr_RidToSid(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("RidToSid failed - %s\n", nt_errstr(status));
-               ret = False;
+                       if (!dom_sid_equal(calc_sid, r.out.sid)) {
+                               printf("RidToSid for %d failed - got %s, expected %s\n", rids[i], 
+                                      dom_sid_string(mem_ctx, r.out.sid), 
+                                      dom_sid_string(mem_ctx, calc_sid));
+                               ret = False;
+                       }
+               }
        }
 
        return ret;
@@ -2726,6 +3298,7 @@ static BOOL test_AddGroupMember(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        status = test_LookupName(p, mem_ctx, domain_handle, TEST_ACCOUNT_NAME, &rid);
        if (!NT_STATUS_IS_OK(status)) {
+               printf("test_AddGroupMember looking up name " TEST_ACCOUNT_NAME " failed - %s\n", nt_errstr(status));
                return False;
        }
 
@@ -2758,16 +3331,21 @@ static BOOL test_AddGroupMember(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       /* this one is quite strange. I am using random inputs in the
-          hope of triggering an error that might give us a clue */
-       s.in.group_handle = group_handle;
-       s.in.unknown1 = random();
-       s.in.unknown2 = random();
+       if (lp_parm_bool(-1, "torture", "samba4", False)) {
+               printf("skipping SetMemberAttributesOfGroup test against Samba4\n");
+       } else {
+               /* this one is quite strange. I am using random inputs in the
+                  hope of triggering an error that might give us a clue */
 
-       status = dcerpc_samr_SetMemberAttributesOfGroup(p, mem_ctx, &s);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("SetMemberAttributesOfGroup failed - %s\n", nt_errstr(status));
-               return False;
+               s.in.group_handle = group_handle;
+               s.in.unknown1 = random();
+               s.in.unknown2 = random();
+
+               status = dcerpc_samr_SetMemberAttributesOfGroup(p, mem_ctx, &s);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("SetMemberAttributesOfGroup failed - %s\n", nt_errstr(status));
+                       return False;
+               }
        }
 
        q.in.group_handle = group_handle;
@@ -2800,30 +3378,41 @@ static BOOL test_CreateDomainGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        NTSTATUS status;
        struct samr_CreateDomainGroup r;
        uint32_t rid;
-       struct samr_Name name;
+       struct lsa_String name;
        BOOL ret = True;
 
-       init_samr_Name(&name, TEST_GROUPNAME);
+       init_lsa_String(&name, TEST_GROUPNAME);
 
        r.in.domain_handle = domain_handle;
        r.in.name = &name;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.group_handle = group_handle;
        r.out.rid = &rid;
 
-       printf("Testing CreateDomainGroup(%s)\n", r.in.name->name);
+       printf("Testing CreateDomainGroup(%s)\n", r.in.name->string);
 
        status = dcerpc_samr_CreateDomainGroup(p, mem_ctx, &r);
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
-               printf("Server refused create of '%s'\n", r.in.name->name);
+               printf("Server refused create of '%s'\n", r.in.name->string);
                ZERO_STRUCTP(group_handle);
                return True;
        }
 
-       if (NT_STATUS_EQUAL(status, NT_STATUS_GROUP_EXISTS) ||
-           NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
-               if (!test_DeleteGroup_byname(p, mem_ctx, domain_handle, r.in.name->name)) {
+       if (NT_STATUS_EQUAL(status, NT_STATUS_GROUP_EXISTS)) {
+               if (!test_DeleteGroup_byname(p, mem_ctx, domain_handle, r.in.name->string)) {
+                       
+                       printf("CreateDomainGroup failed: Could not delete domain group %s - %s\n", r.in.name->string, 
+                              nt_errstr(status));
+                       return False;
+               }
+               status = dcerpc_samr_CreateDomainGroup(p, mem_ctx, &r);
+       }
+       if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
+               if (!test_DeleteUser_byname(p, mem_ctx, domain_handle, r.in.name->string)) {
+                       
+                       printf("CreateDomainGroup failed: Could not delete user %s - %s\n", r.in.name->string, 
+                              nt_errstr(status));
                        return False;
                }
                status = dcerpc_samr_CreateDomainGroup(p, mem_ctx, &r);
@@ -2834,6 +3423,7 @@ static BOOL test_CreateDomainGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        if (!test_AddGroupMember(p, mem_ctx, domain_handle, group_handle)) {
+               printf("CreateDomainGroup failed - %s\n", nt_errstr(status));
                ret = False;
        }
 
@@ -2856,7 +3446,7 @@ static BOOL test_RemoveMemberFromForeignDomain(struct dcerpc_pipe *p,
        struct samr_RemoveMemberFromForeignDomain r;
 
        r.in.domain_handle = domain_handle;
-       r.in.sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-12-34-56-78-9");
+       r.in.sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-12-34-56-78");
 
        status = dcerpc_samr_RemoveMemberFromForeignDomain(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2873,25 +3463,26 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                         struct policy_handle *handle);
 
 static BOOL test_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                           struct policy_handle *handle, struct dom_sid *sid)
+                           struct policy_handle *handle, struct dom_sid *sid,
+                           enum torture_samr_choice which_ops)
 {
        NTSTATUS status;
        struct samr_OpenDomain r;
        struct policy_handle domain_handle;
-       struct policy_handle user_handle;
        struct policy_handle alias_handle;
+       struct policy_handle user_handle;
        struct policy_handle group_handle;
        BOOL ret = True;
 
-       ZERO_STRUCT(user_handle);
        ZERO_STRUCT(alias_handle);
+       ZERO_STRUCT(user_handle);
        ZERO_STRUCT(group_handle);
        ZERO_STRUCT(domain_handle);
 
        printf("Testing OpenDomain\n");
 
        r.in.connect_handle = handle;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.sid = sid;
        r.out.domain_handle = &domain_handle;
 
@@ -2903,29 +3494,43 @@ static BOOL test_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        /* run the domain tests with the main handle closed - this tests
           the servers reference counting */
-       ret &= test_Close(p, mem_ctx, handle);
-
-       ret &= test_QuerySecurity(p, mem_ctx, &domain_handle);
-       ret &= test_RemoveMemberFromForeignDomain(p, mem_ctx, &domain_handle);
-       ret &= test_CreateUser2(p, mem_ctx, &domain_handle);
-       ret &= test_CreateUser(p, mem_ctx, &domain_handle, &user_handle);
-       ret &= test_CreateAlias(p, mem_ctx, &domain_handle, &alias_handle, sid);
-       ret &= test_CreateDomainGroup(p, mem_ctx, &domain_handle, &group_handle);
-       ret &= test_QueryDomainInfo(p, mem_ctx, &domain_handle);
-       ret &= test_QueryDomainInfo2(p, mem_ctx, &domain_handle);
-       ret &= test_EnumDomainUsers(p, mem_ctx, &domain_handle);
-       ret &= test_EnumDomainUsers_async(p, mem_ctx, &domain_handle);
-       ret &= test_EnumDomainGroups(p, mem_ctx, &domain_handle);
-       ret &= test_EnumDomainAliases(p, mem_ctx, &domain_handle);
-       ret &= test_QueryDisplayInfo(p, mem_ctx, &domain_handle);
-       ret &= test_QueryDisplayInfo2(p, mem_ctx, &domain_handle);
-       ret &= test_QueryDisplayInfo3(p, mem_ctx, &domain_handle);
-       ret &= test_GetDisplayEnumerationIndex(p, mem_ctx, &domain_handle);
-       ret &= test_GetDisplayEnumerationIndex2(p, mem_ctx, &domain_handle);
-       ret &= test_GroupList(p, mem_ctx, &domain_handle);
-       ret &= test_TestPrivateFunctionsDomain(p, mem_ctx, &domain_handle);
-       ret &= test_RidToSid(p, mem_ctx, &domain_handle);
-       ret &= test_GetBootKeyInformation(p, mem_ctx, &domain_handle);
+       ret &= test_samr_handle_Close(p, mem_ctx, handle);
+
+       switch (which_ops) {
+       case TORTURE_SAMR_USER_ATTRIBUTES:
+       case TORTURE_SAMR_PASSWORDS:
+               ret &= test_CreateUser(p, mem_ctx, &domain_handle, NULL, which_ops);
+               ret &= test_CreateUser2(p, mem_ctx, &domain_handle, which_ops);
+               break;
+       case TORTURE_SAMR_OTHER:
+               ret &= test_CreateUser(p, mem_ctx, &domain_handle, &user_handle, which_ops);
+               ret &= test_QuerySecurity(p, mem_ctx, &domain_handle);
+               ret &= test_RemoveMemberFromForeignDomain(p, mem_ctx, &domain_handle);
+               ret &= test_CreateAlias(p, mem_ctx, &domain_handle, &alias_handle, sid);
+               ret &= test_CreateDomainGroup(p, mem_ctx, &domain_handle, &group_handle);
+               ret &= test_QueryDomainInfo(p, mem_ctx, &domain_handle);
+               ret &= test_QueryDomainInfo2(p, mem_ctx, &domain_handle);
+               ret &= test_EnumDomainUsers(p, mem_ctx, &domain_handle);
+               ret &= test_EnumDomainUsers_async(p, mem_ctx, &domain_handle);
+               ret &= test_EnumDomainGroups(p, mem_ctx, &domain_handle);
+               ret &= test_EnumDomainAliases(p, mem_ctx, &domain_handle);
+               ret &= test_QueryDisplayInfo(p, mem_ctx, &domain_handle);
+               ret &= test_QueryDisplayInfo2(p, mem_ctx, &domain_handle);
+               ret &= test_QueryDisplayInfo3(p, mem_ctx, &domain_handle);
+               ret &= test_QueryDisplayInfo_continue(p, mem_ctx, &domain_handle);
+               
+               if (lp_parm_bool(-1, "torture", "samba4", False)) {
+                       printf("skipping GetDisplayEnumerationIndex test against Samba4\n");
+               } else {
+                       ret &= test_GetDisplayEnumerationIndex(p, mem_ctx, &domain_handle);
+                       ret &= test_GetDisplayEnumerationIndex2(p, mem_ctx, &domain_handle);
+               }
+               ret &= test_GroupList(p, mem_ctx, &domain_handle);
+               ret &= test_TestPrivateFunctionsDomain(p, mem_ctx, &domain_handle);
+               ret &= test_RidToSid(p, mem_ctx, sid, &domain_handle);
+               ret &= test_GetBootKeyInformation(p, mem_ctx, &domain_handle);
+               break;
+       }
 
        if (!policy_handle_empty(&user_handle) &&
            !test_DeleteUser(p, mem_ctx, &user_handle)) {
@@ -2942,28 +3547,34 @@ static BOOL test_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       ret &= test_Close(p, mem_ctx, &domain_handle);
+       ret &= test_samr_handle_Close(p, mem_ctx, &domain_handle);
 
        /* reconnect the main handle */
        ret &= test_Connect(p, mem_ctx, handle);
 
+       if (!ret) {
+               printf("Testing domain %s failed!\n", dom_sid_string(mem_ctx, sid));
+       }
+
        return ret;
 }
 
 static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                             struct policy_handle *handle, struct samr_Name *domain)
+                             struct policy_handle *handle, const char *domain,
+                             enum torture_samr_choice which_ops)
 {
        NTSTATUS status;
        struct samr_LookupDomain r;
-       struct samr_Name n2;
+       struct lsa_String n1;
+       struct lsa_String n2;
        BOOL ret = True;
 
-       printf("Testing LookupDomain(%s)\n", domain->name);
+       printf("Testing LookupDomain(%s)\n", domain);
 
        /* check for correct error codes */
        r.in.connect_handle = handle;
-       r.in.domain = &n2;
-       n2.name = NULL;
+       r.in.domain_name = &n2;
+       n2.string = NULL;
 
        status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
        if (!NT_STATUS_EQUAL(NT_STATUS_INVALID_PARAMETER, status)) {
@@ -2971,7 +3582,7 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       n2.name = "xxNODOMAINxx";
+       init_lsa_String(&n2, "xxNODOMAINxx");
 
        status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
        if (!NT_STATUS_EQUAL(NT_STATUS_NO_SUCH_DOMAIN, status)) {
@@ -2980,7 +3591,9 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        r.in.connect_handle = handle;
-       r.in.domain = domain;
+
+       init_lsa_String(&n1, domain);
+       r.in.domain_name = &n1;
 
        status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2988,11 +3601,11 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       if (!test_GetDomPwInfo(p, mem_ctx, domain)) {
+       if (!test_GetDomPwInfo(p, mem_ctx, &n1)) {
                ret = False;
        }
 
-       if (!test_OpenDomain(p, mem_ctx, handle, r.out.sid)) {
+       if (!test_OpenDomain(p, mem_ctx, handle, r.out.sid, which_ops)) {
                ret = False;
        }
 
@@ -3001,7 +3614,7 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_EnumDomains(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                            struct policy_handle *handle)
+                            struct policy_handle *handle, enum torture_samr_choice which_ops)
 {
        NTSTATUS status;
        struct samr_EnumDomains r;
@@ -3026,7 +3639,7 @@ static BOOL test_EnumDomains(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        for (i=0;i<r.out.sam->count;i++) {
                if (!test_LookupDomain(p, mem_ctx, handle, 
-                                      &r.out.sam->entries[i].name)) {
+                                      r.out.sam->entries[i].name.string, which_ops)) {
                        ret = False;
                }
        }
@@ -3057,7 +3670,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("testing samr_Connect\n");
 
        r.in.system_name = 0;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.connect_handle = &h;
 
        status = dcerpc_samr_Connect(p, mem_ctx, &r);
@@ -3072,7 +3685,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        printf("testing samr_Connect2\n");
 
        r2.in.system_name = NULL;
-       r2.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r2.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r2.out.connect_handle = &h;
 
        status = dcerpc_samr_Connect2(p, mem_ctx, &r2);
@@ -3081,7 +3694,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        } else {
                if (got_handle) {
-                       test_Close(p, mem_ctx, handle);
+                       test_samr_handle_Close(p, mem_ctx, handle);
                }
                got_handle = True;
                *handle = h;
@@ -3091,7 +3704,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r3.in.system_name = NULL;
        r3.in.unknown = 0;
-       r3.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r3.out.connect_handle = &h;
 
        status = dcerpc_samr_Connect3(p, mem_ctx, &r3);
@@ -3100,7 +3713,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        } else {
                if (got_handle) {
-                       test_Close(p, mem_ctx, handle);
+                       test_samr_handle_Close(p, mem_ctx, handle);
                }
                got_handle = True;
                *handle = h;
@@ -3110,7 +3723,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r4.in.system_name = "";
        r4.in.unknown = 0;
-       r4.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r4.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r4.out.connect_handle = &h;
 
        status = dcerpc_samr_Connect4(p, mem_ctx, &r4);
@@ -3119,7 +3732,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        } else {
                if (got_handle) {
-                       test_Close(p, mem_ctx, handle);
+                       test_samr_handle_Close(p, mem_ctx, handle);
                }
                got_handle = True;
                *handle = h;
@@ -3131,7 +3744,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        info.info1.unknown2 = 0;
 
        r5.in.system_name = "";
-       r5.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r5.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r5.in.level = 1;
        r5.in.info = &info;
        r5.out.info = &info;
@@ -3143,7 +3756,7 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        } else {
                if (got_handle) {
-                       test_Close(p, mem_ctx, handle);
+                       test_samr_handle_Close(p, mem_ctx, handle);
                }
                got_handle = True;
                *handle = h;
@@ -3153,51 +3766,79 @@ static BOOL test_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_rpc_samr(int dummy)
+BOOL torture_rpc_samr(struct torture_context *torture)
 {
-        NTSTATUS status;
-        struct dcerpc_pipe *p;
-       TALLOC_CTX *mem_ctx;
+       NTSTATUS status;
+       struct dcerpc_pipe *p;
        BOOL ret = True;
        struct policy_handle handle;
 
-       mem_ctx = talloc_init("torture_rpc_samr");
-
-       status = torture_rpc_connection(&p, 
-                                       DCERPC_SAMR_NAME,
-                                       DCERPC_SAMR_UUID,
-                                       DCERPC_SAMR_VERSION);
+       status = torture_rpc_connection(torture, &p, &dcerpc_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
 
-       if (!test_Connect(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       ret &= test_Connect(p, torture, &handle);
 
-       if (!test_QuerySecurity(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       ret &= test_QuerySecurity(p, torture, &handle);
 
-       if (!test_EnumDomains(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_OTHER);
 
-       if (!test_SetDsrmPassword(p, mem_ctx, &handle)) {
-               ret = False;
-       }
+       ret &= test_SetDsrmPassword(p, torture, &handle);
 
-       if (!test_Shutdown(p, mem_ctx, &handle)) {
-               ret = False;
+       ret &= test_Shutdown(p, torture, &handle);
+
+       ret &= test_samr_handle_Close(p, torture, &handle);
+
+       return ret;
+}
+
+
+BOOL torture_rpc_samr_users(struct torture_context *torture)
+{
+       NTSTATUS status;
+       struct dcerpc_pipe *p;
+       BOOL ret = True;
+       struct policy_handle handle;
+
+       status = torture_rpc_connection(torture, &p, &dcerpc_table_samr);
+       if (!NT_STATUS_IS_OK(status)) {
+               return False;
        }
 
-       if (!test_Close(p, mem_ctx, &handle)) {
-               ret = False;
+       ret &= test_Connect(p, torture, &handle);
+
+       ret &= test_QuerySecurity(p, torture, &handle);
+
+       ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_USER_ATTRIBUTES);
+
+       ret &= test_SetDsrmPassword(p, torture, &handle);
+
+       ret &= test_Shutdown(p, torture, &handle);
+
+       ret &= test_samr_handle_Close(p, torture, &handle);
+
+       return ret;
+}
+
+
+BOOL torture_rpc_samr_passwords(struct torture_context *torture)
+{
+       NTSTATUS status;
+       struct dcerpc_pipe *p;
+       BOOL ret = True;
+       struct policy_handle handle;
+
+       status = torture_rpc_connection(torture, &p, &dcerpc_table_samr);
+       if (!NT_STATUS_IS_OK(status)) {
+               return False;
        }
 
-       talloc_destroy(mem_ctx);
+       ret &= test_Connect(p, torture, &handle);
+
+       ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_PASSWORDS);
 
-        torture_rpc_close(p);
+       ret &= test_samr_handle_Close(p, torture, &handle);
 
        return ret;
 }