s4-smbtorture: skip GetAliasMembership against s4.
[ira/wip.git] / source4 / torture / rpc / samr.c
index c448b3bb83ecbfe45b25e965e8f0f1f35dc2758c..b5aa761b797e01f6f1a0927a745deae5186ed3af 100644 (file)
@@ -54,6 +54,13 @@ enum torture_samr_choice {
        TORTURE_SAMR_MANY_ALIASES
 };
 
+struct torture_samr_context {
+       struct policy_handle handle;
+       struct cli_credentials *machine_credentials;
+       enum torture_samr_choice choice;
+       uint32_t num_objects_large_dc;
+};
+
 static bool test_QueryUserInfo(struct dcerpc_pipe *p,
                               struct torture_context *tctx,
                               struct policy_handle *handle);
@@ -2586,6 +2593,56 @@ static bool test_AddMultipleMembersToAlias(struct dcerpc_pipe *p, struct torture
        return true;
 }
 
+static bool test_GetAliasMembership(struct dcerpc_pipe *p,
+                                   struct torture_context *tctx,
+                                   struct policy_handle *domain_handle)
+{
+       struct samr_GetAliasMembership r;
+       struct lsa_SidArray sids;
+       struct samr_Ids rids;
+       NTSTATUS status;
+
+       torture_comment(tctx, "Testing GetAliasMembership\n");
+
+       if (torture_setting_bool(tctx, "samba4", false)) {
+               torture_skip(tctx, "skipping GetAliasMembership against s4");
+       }
+
+       r.in.domain_handle      = domain_handle;
+       r.in.sids               = &sids;
+       r.out.rids              = &rids;
+
+       sids.num_sids = 0;
+       sids.sids = talloc_zero_array(tctx, struct lsa_SidPtr, sids.num_sids);
+
+       status = dcerpc_samr_GetAliasMembership(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status,
+               "samr_GetAliasMembership failed");
+
+       torture_assert_int_equal(tctx, sids.num_sids, rids.count,
+               "protocol misbehaviour");
+
+       sids.num_sids = 1;
+       sids.sids = talloc_zero_array(tctx, struct lsa_SidPtr, sids.num_sids);
+       sids.sids[0].sid = dom_sid_parse_talloc(tctx, "S-1-5-32-1-2-3-1");
+
+       status = dcerpc_samr_GetAliasMembership(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status,
+               "samr_GetAliasMembership failed");
+
+#if 0
+       /* only true for w2k8 it seems
+        * win7, xp, w2k3 will return a 0 length array pointer */
+
+       torture_assert(tctx, (rids.ids && !rids.count),
+               "samr_GetAliasMembership protocol misbehaviour");
+#endif
+       torture_assert(tctx, (!rids.ids && rids.count),
+               "samr_GetAliasMembership protocol misbehaviour");
+
+       return true;
+}
+
 static bool test_TestPrivateFunctionsUser(struct dcerpc_pipe *p, struct torture_context *tctx,
                                            struct policy_handle *user_handle)
 {
@@ -3275,6 +3332,8 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
 #undef TEST_SET_LEVELS
 #undef TEST_QUERY_LEVELS
 
+       talloc_free(np);
+
        return ret;
 }
 
@@ -6271,9 +6330,9 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
                             struct torture_context *tctx,
                             struct policy_handle *domain_handle,
                             struct dom_sid *domain_sid,
-                            enum torture_samr_choice which_ops)
+                            struct torture_samr_context *ctx)
 {
-       uint32_t num_total = 1500;
+       uint32_t num_total = ctx->num_objects_large_dc;
        uint32_t num_enum = 0;
        uint32_t num_disp = 0;
        uint32_t num_created = 0;
@@ -6297,7 +6356,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
                torture_assert_ntstatus_ok(tctx, status,
                        "failed to query domain info");
 
-               switch (which_ops) {
+               switch (ctx->choice) {
                case TORTURE_SAMR_MANY_ACCOUNTS:
                        num_anounced = info->general.num_users;
                        break;
@@ -6318,7 +6377,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
 
                const char *name = NULL;
 
-               switch (which_ops) {
+               switch (ctx->choice) {
                case TORTURE_SAMR_MANY_ACCOUNTS:
                        name = talloc_asprintf(tctx, "%s%04d", TEST_ACCOUNT_NAME, i);
                        ret &= test_CreateUser(p, tctx, domain_handle, name, &handles[i], domain_sid, 0, NULL, false);
@@ -6341,7 +6400,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
 
        /* enum */
 
-       switch (which_ops) {
+       switch (ctx->choice) {
        case TORTURE_SAMR_MANY_ACCOUNTS:
                ret &= test_EnumDomainUsers(p, tctx, domain_handle, &num_enum);
                break;
@@ -6357,7 +6416,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
 
        /* dispinfo */
 
-       switch (which_ops) {
+       switch (ctx->choice) {
        case TORTURE_SAMR_MANY_ACCOUNTS:
                ret &= test_QueryDisplayInfo_level(p, tctx, domain_handle, 1, &num_disp);
                break;
@@ -6382,7 +6441,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
                if (torture_setting_bool(tctx, "samba3", false)) {
                        ret &= test_samr_handle_Close(p, tctx, &handles[i]);
                } else {
-                       switch (which_ops) {
+                       switch (ctx->choice) {
                        case TORTURE_SAMR_MANY_ACCOUNTS:
                                ret &= test_DeleteUser(p, tctx, &handles[i]);
                                break;
@@ -6400,7 +6459,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
 
        talloc_free(handles);
 
-       if (which_ops == TORTURE_SAMR_MANY_ACCOUNTS && num_enum != num_anounced + num_created) {
+       if (ctx->choice == TORTURE_SAMR_MANY_ACCOUNTS && num_enum != num_anounced + num_created) {
                torture_comment(tctx,
                                "unexpected number of results (%u) returned in enum call, expected %u\n",
                                num_enum, num_anounced + num_created);
@@ -6416,9 +6475,7 @@ static bool test_Connect(struct dcerpc_pipe *p, struct torture_context *tctx,
                         struct policy_handle *handle);
 
 static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
-                           struct policy_handle *handle, struct dom_sid *sid,
-                           enum torture_samr_choice which_ops,
-                           struct cli_credentials *machine_credentials)
+                           struct torture_samr_context *ctx, struct dom_sid *sid)
 {
        NTSTATUS status;
        struct samr_OpenDomain r;
@@ -6435,7 +6492,7 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
 
        torture_comment(tctx, "Testing OpenDomain of %s\n", dom_sid_string(tctx, sid));
 
-       r.in.connect_handle = handle;
+       r.in.connect_handle = &ctx->handle;
        r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.sid = sid;
        r.out.domain_handle = &domain_handle;
@@ -6445,24 +6502,24 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
 
        /* run the domain tests with the main handle closed - this tests
           the servers reference counting */
-       torture_assert(tctx, test_samr_handle_Close(p, tctx, handle), "Failed to close SAMR handle");
+       torture_assert(tctx, test_samr_handle_Close(p, tctx, &ctx->handle), "Failed to close SAMR handle");
 
-       switch (which_ops) {
+       switch (ctx->choice) {
        case TORTURE_SAMR_PASSWORDS:
        case TORTURE_SAMR_USER_PRIVILEGES:
                if (!torture_setting_bool(tctx, "samba3", false)) {
-                       ret &= test_CreateUser2(p, tctx, &domain_handle, sid, which_ops, NULL);
+                       ret &= test_CreateUser2(p, tctx, &domain_handle, sid, ctx->choice, NULL);
                }
-               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, which_ops, NULL, true);
+               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, ctx->choice, NULL, true);
                if (!ret) {
-                       torture_warning(tctx, "Testing PASSWORDS or PRIVILAGES on domain %s failed!\n", dom_sid_string(tctx, sid));
+                       torture_warning(tctx, "Testing PASSWORDS or PRIVILEGES on domain %s failed!\n", dom_sid_string(tctx, sid));
                }
                break;
        case TORTURE_SAMR_USER_ATTRIBUTES:
                if (!torture_setting_bool(tctx, "samba3", false)) {
-                       ret &= test_CreateUser2(p, tctx, &domain_handle, sid, which_ops, NULL);
+                       ret &= test_CreateUser2(p, tctx, &domain_handle, sid, ctx->choice, NULL);
                }
-               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, which_ops, NULL, true);
+               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, ctx->choice, NULL, true);
                /* This test needs 'complex' users to validate */
                ret &= test_QueryDisplayInfo(p, tctx, &domain_handle);
                if (!ret) {
@@ -6471,9 +6528,9 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
                break;
        case TORTURE_SAMR_PASSWORDS_PWDLASTSET:
                if (!torture_setting_bool(tctx, "samba3", false)) {
-                       ret &= test_CreateUser2(p, tctx, &domain_handle, sid, which_ops, machine_credentials);
+                       ret &= test_CreateUser2(p, tctx, &domain_handle, sid, ctx->choice, ctx->machine_credentials);
                }
-               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, which_ops, machine_credentials, true);
+               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, ctx->choice, ctx->machine_credentials, true);
                if (!ret) {
                        torture_warning(tctx, "Testing PASSWORDS PWDLASTSET on domain %s failed!\n", dom_sid_string(tctx, sid));
                }
@@ -6481,13 +6538,13 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
        case TORTURE_SAMR_MANY_ACCOUNTS:
        case TORTURE_SAMR_MANY_GROUPS:
        case TORTURE_SAMR_MANY_ALIASES:
-               ret &= test_ManyObjects(p, tctx, &domain_handle, sid, which_ops);
+               ret &= test_ManyObjects(p, tctx, &domain_handle, sid, ctx);
                if (!ret) {
                        torture_warning(tctx, "Testing MANY-{ACCOUNTS,GROUPS,ALIASES} on domain %s failed!\n", dom_sid_string(tctx, sid));
                }
                break;
        case TORTURE_SAMR_OTHER:
-               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, which_ops, NULL, true);
+               ret &= test_CreateUser(p, tctx, &domain_handle, TEST_ACCOUNT_NAME, &user_handle, sid, ctx->choice, NULL, true);
                if (!ret) {
                        torture_warning(tctx, "Failed to CreateUser in SAMR-OTHER on domain %s!\n", dom_sid_string(tctx, sid));
                }
@@ -6497,6 +6554,7 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
                ret &= test_RemoveMemberFromForeignDomain(p, tctx, &domain_handle);
                ret &= test_CreateAlias(p, tctx, &domain_handle, TEST_ALIASNAME, &alias_handle, sid, true);
                ret &= test_CreateDomainGroup(p, tctx, &domain_handle, TEST_GROUPNAME, &group_handle, sid, true);
+               ret &= test_GetAliasMembership(p, tctx, &domain_handle);
                ret &= test_QueryDomainInfo(p, tctx, &domain_handle);
                ret &= test_QueryDomainInfo2(p, tctx, &domain_handle);
                ret &= test_EnumDomainUsers_all(p, tctx, &domain_handle);
@@ -6540,7 +6598,7 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
 
        torture_assert(tctx, test_samr_handle_Close(p, tctx, &domain_handle), "Failed to close SAMR domain handle");
 
-       torture_assert(tctx, test_Connect(p, tctx, handle), "Faile to re-connect SAMR handle");
+       torture_assert(tctx, test_Connect(p, tctx, &ctx->handle), "Faile to re-connect SAMR handle");
        /* reconnect the main handle */
 
        if (!ret) {
@@ -6551,9 +6609,7 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
 }
 
 static bool test_LookupDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
-                             struct policy_handle *handle, const char *domain,
-                             enum torture_samr_choice which_ops,
-                             struct cli_credentials *machine_credentials)
+                             struct torture_samr_context *ctx, const char *domain)
 {
        NTSTATUS status;
        struct samr_LookupDomain r;
@@ -6565,7 +6621,7 @@ static bool test_LookupDomain(struct dcerpc_pipe *p, struct torture_context *tct
        torture_comment(tctx, "Testing LookupDomain(%s)\n", domain);
 
        /* check for correct error codes */
-       r.in.connect_handle = handle;
+       r.in.connect_handle = &ctx->handle;
        r.in.domain_name = &n2;
        r.out.sid = &sid;
        n2.string = NULL;
@@ -6578,7 +6634,7 @@ static bool test_LookupDomain(struct dcerpc_pipe *p, struct torture_context *tct
        status = dcerpc_samr_LookupDomain(p, tctx, &r);
        torture_assert_ntstatus_equal(tctx, NT_STATUS_NO_SUCH_DOMAIN, status, "LookupDomain expected NT_STATUS_NO_SUCH_DOMAIN");
 
-       r.in.connect_handle = handle;
+       r.in.connect_handle = &ctx->handle;
 
        init_lsa_String(&n1, domain);
        r.in.domain_name = &n1;
@@ -6590,8 +6646,7 @@ static bool test_LookupDomain(struct dcerpc_pipe *p, struct torture_context *tct
                ret = false;
        }
 
-       if (!test_OpenDomain(p, tctx, handle, *r.out.sid, which_ops,
-                            machine_credentials)) {
+       if (!test_OpenDomain(p, tctx, ctx, *r.out.sid)) {
                ret = false;
        }
 
@@ -6600,8 +6655,7 @@ static bool test_LookupDomain(struct dcerpc_pipe *p, struct torture_context *tct
 
 
 static bool test_EnumDomains(struct dcerpc_pipe *p, struct torture_context *tctx,
-                            struct policy_handle *handle, enum torture_samr_choice which_ops,
-                            struct cli_credentials *machine_credentials)
+                            struct torture_samr_context *ctx)
 {
        NTSTATUS status;
        struct samr_EnumDomains r;
@@ -6611,7 +6665,7 @@ static bool test_EnumDomains(struct dcerpc_pipe *p, struct torture_context *tctx
        int i;
        bool ret = true;
 
-       r.in.connect_handle = handle;
+       r.in.connect_handle = &ctx->handle;
        r.in.resume_handle = &resume_handle;
        r.in.buf_size = (uint32_t)-1;
        r.out.resume_handle = &resume_handle;
@@ -6626,9 +6680,8 @@ static bool test_EnumDomains(struct dcerpc_pipe *p, struct torture_context *tctx
        }
 
        for (i=0;i<sam->count;i++) {
-               if (!test_LookupDomain(p, tctx, handle,
-                                      sam->entries[i].name.string, which_ops,
-                                      machine_credentials)) {
+               if (!test_LookupDomain(p, tctx, ctx,
+                                      sam->entries[i].name.string)) {
                        ret = false;
                }
        }
@@ -6763,11 +6816,13 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p, struct torture_con
        const char *passwords[] = { "penguin", "p@ssw0rd", "p@ssw0rd123$", NULL };
        int i;
 
+       torture_comment(tctx, "testing samr_ValidatePassword\n");
+
        ZERO_STRUCT(r);
        r.in.level = NetValidatePasswordReset;
        r.in.req = &req;
        r.out.rep = &repp;
-       
+
        ZERO_STRUCT(req);
        req.req3.account.string = "non-existant-account-aklsdji";
 
@@ -6775,12 +6830,12 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p, struct torture_con
                req.req3.password.string = passwords[i];
                status = dcerpc_samr_ValidatePassword(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "samr_ValidatePassword");
-               torture_comment(tctx, "Server %s password '%s'\n", 
+               torture_comment(tctx, "Server %s password '%s' with code %i\n",
                                repp->ctr3.status==SAMR_VALIDATION_STATUS_SUCCESS?"allowed":"refused",
-                               req.req3.password.string);
+                               req.req3.password.string, repp->ctr3.status);
        }
 
-       return true;    
+       return true;
 }
 
 bool torture_rpc_samr(struct torture_context *torture)
@@ -6788,31 +6843,30 @@ bool torture_rpc_samr(struct torture_context *torture)
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx;
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
+       ctx = talloc_zero(torture, struct torture_samr_context);
 
-       if (torture_setting_bool(torture, "dangerous", false)) {
-               ret &= test_samr_ValidatePassword(p, torture);
-       }
+       ctx->choice = TORTURE_SAMR_OTHER;
 
-       ret &= test_Connect(p, torture, &handle);
+       ret &= test_Connect(p, torture, &ctx->handle);
 
        if (!torture_setting_bool(torture, "samba3", false)) {
-               ret &= test_QuerySecurity(p, torture, &handle);
+               ret &= test_QuerySecurity(p, torture, &ctx->handle);
        }
 
-       ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_OTHER, NULL);
+       ret &= test_EnumDomains(p, torture, ctx);
 
-       ret &= test_SetDsrmPassword(p, torture, &handle);
+       ret &= test_SetDsrmPassword(p, torture, &ctx->handle);
 
-       ret &= test_Shutdown(p, torture, &handle);
+       ret &= test_Shutdown(p, torture, &ctx->handle);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
@@ -6823,26 +6877,30 @@ bool torture_rpc_samr_users(struct torture_context *torture)
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx;
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx = talloc_zero(torture, struct torture_samr_context);
+
+       ctx->choice = TORTURE_SAMR_USER_ATTRIBUTES;
+
+       ret &= test_Connect(p, torture, &ctx->handle);
 
        if (!torture_setting_bool(torture, "samba3", false)) {
-               ret &= test_QuerySecurity(p, torture, &handle);
+               ret &= test_QuerySecurity(p, torture, &ctx->handle);
        }
 
-       ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_USER_ATTRIBUTES, NULL);
+       ret &= test_EnumDomains(p, torture, ctx);
 
-       ret &= test_SetDsrmPassword(p, torture, &handle);
+       ret &= test_SetDsrmPassword(p, torture, &ctx->handle);
 
-       ret &= test_Shutdown(p, torture, &handle);
+       ret &= test_Shutdown(p, torture, &ctx->handle);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
@@ -6853,18 +6911,24 @@ bool torture_rpc_samr_passwords(struct torture_context *torture)
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx;
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx = talloc_zero(torture, struct torture_samr_context);
+
+       ctx->choice = TORTURE_SAMR_PASSWORDS;
+
+       ret &= test_Connect(p, torture, &ctx->handle);
+
+       ret &= test_EnumDomains(p, torture, ctx);
 
-       ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_PASSWORDS, NULL);
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_samr_ValidatePassword(p, torture);
 
        return ret;
 }
@@ -6876,20 +6940,23 @@ static bool torture_rpc_samr_pwdlastset(struct torture_context *torture,
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx;
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx = talloc_zero(torture, struct torture_samr_context);
+
+       ctx->choice = TORTURE_SAMR_PASSWORDS_PWDLASTSET;
+       ctx->machine_credentials = machine_credentials;
 
-       ret &= test_EnumDomains(p, torture, &handle,
-                               TORTURE_SAMR_PASSWORDS_PWDLASTSET,
-                               machine_credentials);
+       ret &= test_Connect(p, torture, &ctx->handle);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_EnumDomains(p, torture, ctx);
+
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
@@ -6916,20 +6983,23 @@ static bool torture_rpc_samr_users_privileges_delete_user(struct torture_context
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx;
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx = talloc_zero(torture, struct torture_samr_context);
 
-       ret &= test_EnumDomains(p, torture, &handle,
-                               TORTURE_SAMR_USER_PRIVILEGES,
-                               machine_credentials);
+       ctx->choice = TORTURE_SAMR_USER_PRIVILEGES;
+       ctx->machine_credentials = machine_credentials;
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_Connect(p, torture, &ctx->handle);
+
+       ret &= test_EnumDomains(p, torture, ctx);
+
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
@@ -6951,75 +7021,84 @@ struct torture_suite *torture_rpc_samr_user_privileges(TALLOC_CTX *mem_ctx)
 
 static bool torture_rpc_samr_many_accounts(struct torture_context *torture,
                                           struct dcerpc_pipe *p2,
-                                          struct cli_credentials *machine_credentials)
+                                          void *data)
 {
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx =
+               talloc_get_type_abort(data, struct torture_samr_context);
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx->choice = TORTURE_SAMR_MANY_ACCOUNTS;
+       ctx->num_objects_large_dc = torture_setting_int(torture, "large_dc",
+                                                       ctx->num_objects_large_dc);
+
+       ret &= test_Connect(p, torture, &ctx->handle);
 
-       ret &= test_EnumDomains(p, torture, &handle,
-                               TORTURE_SAMR_MANY_ACCOUNTS,
-                               machine_credentials);
+       ret &= test_EnumDomains(p, torture, ctx);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
 
 static bool torture_rpc_samr_many_groups(struct torture_context *torture,
                                         struct dcerpc_pipe *p2,
-                                        struct cli_credentials *machine_credentials)
+                                        void *data)
 {
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx =
+               talloc_get_type_abort(data, struct torture_samr_context);
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx->choice = TORTURE_SAMR_MANY_GROUPS;
+       ctx->num_objects_large_dc = torture_setting_int(torture, "large_dc",
+                                                       ctx->num_objects_large_dc);
+
+       ret &= test_Connect(p, torture, &ctx->handle);
 
-       ret &= test_EnumDomains(p, torture, &handle,
-                               TORTURE_SAMR_MANY_GROUPS,
-                               machine_credentials);
+       ret &= test_EnumDomains(p, torture, ctx);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
 
 static bool torture_rpc_samr_many_aliases(struct torture_context *torture,
                                          struct dcerpc_pipe *p2,
-                                         struct cli_credentials *machine_credentials)
+                                         void *data)
 {
        NTSTATUS status;
        struct dcerpc_pipe *p;
        bool ret = true;
-       struct policy_handle handle;
+       struct torture_samr_context *ctx =
+               talloc_get_type_abort(data, struct torture_samr_context);
 
        status = torture_rpc_connection(torture, &p, &ndr_table_samr);
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       ret &= test_Connect(p, torture, &handle);
+       ctx->choice = TORTURE_SAMR_MANY_ALIASES;
+       ctx->num_objects_large_dc = torture_setting_int(torture, "large_dc",
+                                                       ctx->num_objects_large_dc);
+
+       ret &= test_Connect(p, torture, &ctx->handle);
 
-       ret &= test_EnumDomains(p, torture, &handle,
-                               TORTURE_SAMR_MANY_ALIASES,
-                               machine_credentials);
+       ret &= test_EnumDomains(p, torture, ctx);
 
-       ret &= test_samr_handle_Close(p, torture, &handle);
+       ret &= test_samr_handle_Close(p, torture, &ctx->handle);
 
        return ret;
 }
@@ -7028,18 +7107,19 @@ struct torture_suite *torture_rpc_samr_large_dc(TALLOC_CTX *mem_ctx)
 {
        struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-LARGE-DC");
        struct torture_rpc_tcase *tcase;
+       struct torture_samr_context *ctx;
 
-       tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "samr",
-                                                         &ndr_table_samr,
-                                                         TEST_ACCOUNT_NAME);
+       tcase = torture_suite_add_rpc_iface_tcase(suite, "samr", &ndr_table_samr);
 
-       torture_rpc_tcase_add_test_creds(tcase, "many_aliases",
-                                        torture_rpc_samr_many_aliases);
-       torture_rpc_tcase_add_test_creds(tcase, "many_groups",
-                                        torture_rpc_samr_many_groups);
-       torture_rpc_tcase_add_test_creds(tcase, "many_accounts",
-                                        torture_rpc_samr_many_accounts);
+       ctx = talloc_zero(suite, struct torture_samr_context);
+       ctx->num_objects_large_dc = 150;
+
+       torture_rpc_tcase_add_test_ex(tcase, "many_aliases",
+                                     torture_rpc_samr_many_aliases, ctx);
+       torture_rpc_tcase_add_test_ex(tcase, "many_groups",
+                                     torture_rpc_samr_many_groups, ctx);
+       torture_rpc_tcase_add_test_ex(tcase, "many_accounts",
+                                     torture_rpc_samr_many_accounts, ctx);
 
        return suite;
 }
-