summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-05-11 23:46:45 +0200
committerGünther Deschner <gd@samba.org>2009-05-12 00:27:23 +0200
commit59cb8fd58d03953ea53eed70da35dd94fe10d9c4 (patch)
tree460751e29392932e9c49be228752991d42cd3339
parent1fb9b65921b617962dd72bf64c62fd95bfdcf326 (diff)
downloadsamba-59cb8fd58d03953ea53eed70da35dd94fe10d9c4.tar.gz
samba-59cb8fd58d03953ea53eed70da35dd94fe10d9c4.tar.bz2
samba-59cb8fd58d03953ea53eed70da35dd94fe10d9c4.zip
s4-smbtorture: Skip secdesc set calls for non-user objects in RPC-SAMR for Samba3.
Note that they are skipped for all objects while testing Samba4. Guenther
-rw-r--r--source4/torture/rpc/samr.c26
1 files changed, 18 insertions, 8 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index d68d945987..40d57bc787 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -3482,8 +3482,10 @@ static bool test_alias_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
{
bool ret = true;
- if (!test_QuerySecurity(p, tctx, alias_handle)) {
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!test_QuerySecurity(p, tctx, alias_handle)) {
+ ret = false;
+ }
}
if (!test_QueryAliasInfo(p, tctx, alias_handle)) {
@@ -4420,8 +4422,10 @@ static bool test_OpenGroup(struct dcerpc_pipe *p,
return false;
}
- if (!test_QuerySecurity(p, tctx, &group_handle)) {
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!test_QuerySecurity(p, tctx, &group_handle)) {
+ ret = false;
+ }
}
if (!test_QueryGroupInfo(p, tctx, &group_handle)) {
@@ -4460,8 +4464,10 @@ static bool test_OpenAlias(struct dcerpc_pipe *p, struct torture_context *tctx,
return false;
}
- if (!test_QuerySecurity(p, tctx, &alias_handle)) {
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!test_QuerySecurity(p, tctx, &alias_handle)) {
+ ret = false;
+ }
}
if (!test_QueryAliasInfo(p, tctx, &alias_handle)) {
@@ -5737,7 +5743,9 @@ static bool test_OpenDomain(struct dcerpc_pipe *p, struct torture_context *tctx,
if (!ret) {
printf("Failed to CreateUser in SAMR-OTHER on domain %s!\n", dom_sid_string(tctx, sid));
}
- ret &= test_QuerySecurity(p, tctx, &domain_handle);
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ ret &= test_QuerySecurity(p, tctx, &domain_handle);
+ }
ret &= test_RemoveMemberFromForeignDomain(p, tctx, &domain_handle);
ret &= test_CreateAlias(p, tctx, &domain_handle, &alias_handle, sid);
ret &= test_CreateDomainGroup(p, tctx, &domain_handle, &group_handle, sid);
@@ -6012,7 +6020,9 @@ bool torture_rpc_samr(struct torture_context *torture)
ret &= test_Connect(p, torture, &handle);
- ret &= test_QuerySecurity(p, torture, &handle);
+ if (!torture_setting_bool(torture, "samba3", false)) {
+ ret &= test_QuerySecurity(p, torture, &handle);
+ }
ret &= test_EnumDomains(p, torture, &handle, TORTURE_SAMR_OTHER, NULL);