diff options
| author | Günther Deschner <gd@samba.org> | 2009-06-08 22:41:23 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-06-08 22:45:16 +0200 |
| commit | bf7c814694f532ebe174f3dcd7bf4115d5006aa6 (patch) | |
| tree | 199e1cb5cfba72ab4407d64e518c243c1cab1bd1 | |
| parent | 7caf51c37a26e855d0ed8d4148a5a91ce8e6807a (diff) | |
| download | samba-bf7c814694f532ebe174f3dcd7bf4115d5006aa6.tar.gz samba-bf7c814694f532ebe174f3dcd7bf4115d5006aa6.tar.bz2 samba-bf7c814694f532ebe174f3dcd7bf4115d5006aa6.zip | |
s4-smbtorture: when testing RPC-SAMR-LARGE-DC its fine to just close the objects.
Guenther
| -rw-r--r-- | source4/torture/rpc/samr.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index db3b09c85b..11e746aa20 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -6347,7 +6347,7 @@ static bool test_ManyObjects(struct dcerpc_pipe *p, return false; } - /* delete */ + /* close or delete */ for (i=0; i < num_total; i++) { @@ -6355,18 +6355,22 @@ static bool test_ManyObjects(struct dcerpc_pipe *p, continue; } - switch (which_ops) { - case TORTURE_SAMR_MANY_ACCOUNTS: - ret &= test_DeleteUser(p, tctx, &handles[i]); - break; - case TORTURE_SAMR_MANY_GROUPS: - ret &= test_DeleteDomainGroup(p, tctx, &handles[i]); - break; - case TORTURE_SAMR_MANY_ALIASES: - ret &= test_DeleteAlias(p, tctx, &handles[i]); - break; - default: - return false; + if (torture_setting_bool(tctx, "samba3", false)) { + ret &= test_samr_handle_Close(p, tctx, &handles[i]); + } else { + switch (which_ops) { + case TORTURE_SAMR_MANY_ACCOUNTS: + ret &= test_DeleteUser(p, tctx, &handles[i]); + break; + case TORTURE_SAMR_MANY_GROUPS: + ret &= test_DeleteDomainGroup(p, tctx, &handles[i]); + break; + case TORTURE_SAMR_MANY_ALIASES: + ret &= test_DeleteAlias(p, tctx, &handles[i]); + break; + default: + return false; + } } } |