diff options
| author | Günther Deschner <gd@samba.org> | 2011-08-31 12:42:51 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-08-31 12:55:42 +0200 |
| commit | d292bc07104fe6dc90fb143e630f2e259fbcb7c7 (patch) | |
| tree | e8f62d3767df1198cd4bfb3e4d720bb288ed1c5f /source4 | |
| parent | 247851d6be428f73170e315121c335190c780736 (diff) | |
| download | samba-d292bc07104fe6dc90fb143e630f2e259fbcb7c7.tar.gz samba-d292bc07104fe6dc90fb143e630f2e259fbcb7c7.tar.bz2 samba-d292bc07104fe6dc90fb143e630f2e259fbcb7c7.zip | |
s4-smbtorture: For now, skip trusted domain auth validation tests against the sambas.
Guenther
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/lsa.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 509f4a213c..f444ef2e91 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -2735,15 +2735,21 @@ static bool test_CreateTrustedDomainEx_common(struct dcerpc_pipe *p, /* For outbound and MIT trusts there is no trust account */ if (trustinfo.trust_direction != 2 && trustinfo.trust_type != 3) { - if (check_dom_trust_pw(p, tctx, trust_name, - "x" TRUSTPW "x")) { - torture_comment(tctx, "Password check passed unexpectedly\n"); - ret = false; - } - if (!check_dom_trust_pw(p, tctx, trust_name, - TRUSTPW)) { - torture_comment(tctx, "Password check failed\n"); - ret = false; + + if (torture_setting_bool(tctx, "samba3", false) || + torture_setting_bool(tctx, "samba4", false)) { + torture_comment(tctx, "skipping trusted domain auth tests against samba"); + } else { + if (check_dom_trust_pw(p, tctx, trust_name, + "x" TRUSTPW "x")) { + torture_comment(tctx, "Password check passed unexpectedly\n"); + ret = false; + } + if (!check_dom_trust_pw(p, tctx, trust_name, + TRUSTPW)) { + torture_comment(tctx, "Password check failed\n"); + ret = false; + } } } |