summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-06-07 02:27:50 +0200
committerGünther Deschner <gd@samba.org>2009-06-08 10:45:11 +0200
commit9e4b51050447eee4fbcf576debf2c8d261808f31 (patch)
tree7322f5e24ce77b510478856fea724e854e6d78cc
parentfb6e83554364b6ed9dde33cf1a1f728e19ab6dd6 (diff)
downloadsamba-9e4b51050447eee4fbcf576debf2c8d261808f31.tar.gz
samba-9e4b51050447eee4fbcf576debf2c8d261808f31.tar.bz2
samba-9e4b51050447eee4fbcf576debf2c8d261808f31.zip
s4-smbtorture: exclude oem_information checking for s3 in RPC-SAMR.
Guenther
-rw-r--r--source4/torture/rpc/samr.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index c4ceb912f9..b5eb0e2434 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -5592,7 +5592,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p, struct torture_context *
if (strcmp(info->general.oem_information.string, domain_comment) != 0) {
printf("QueryDomainInfo level %u returned different oem_information (comment) (%s, expected %s)\n",
levels[i], info->general.oem_information.string, domain_comment);
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ ret = false;
+ }
}
if (!info->general.primary.string) {
printf("QueryDomainInfo level %u returned no PDC name\n",
@@ -5609,7 +5611,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p, struct torture_context *
if (strcmp(info->oem.oem_information.string, domain_comment) != 0) {
printf("QueryDomainInfo level %u returned different oem_information (comment) (%s, expected %s)\n",
levels[i], info->oem.oem_information.string, domain_comment);
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ ret = false;
+ }
}
break;
case 6:
@@ -5623,7 +5627,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p, struct torture_context *
if (strcmp(info->general2.general.oem_information.string, domain_comment) != 0) {
printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
levels[i], info->general2.general.oem_information.string, domain_comment);
- ret = false;
+ if (!torture_setting_bool(tctx, "samba3", false)) {
+ ret = false;
+ }
}
break;
}
@@ -5927,7 +5933,7 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p, struct torture_context *t
if (torture_setting_bool(tctx, "samba4", false) ||
torture_setting_bool(tctx, "samba3", false)) {
- torture_comment(tctx, "skipping SetMemberAttributesOfGroup test against Samba4\n");
+ torture_comment(tctx, "skipping SetMemberAttributesOfGroup test against Samba\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 */