The branch, master has been updated
via e56b92b torture: Cope with WINBINDD_SHOW_SEQUENCE failure for fake
trusts
from f052b60 talloc: Fix some typos in the comments
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e56b92bd95a586181625df8b5e198c3d560eceba
Author: Andrew Bartlett <[email protected]>
Date: Mon May 28 22:35:20 2018 +1200
torture: Cope with WINBINDD_SHOW_SEQUENCE failure for fake trusts
This test has been flapping and we should not be checking the
sequence number of remote trusts in a loop like this. We can write
a test against the trusts we specifically set up if we want to check
remote sequence numbers (and connectivity) against actually working
domains.
When flapping the previous version of the test gave:
WARNING!: ../source4/torture/winbind/struct_based.c:812:
WINBINDD_SHOW_SEQUENCE returned 0, expected 1: WINBINDD_SHOW_SEQUENCE
WARNING!: WINBINDD_SHOW_SEQUENCE on domain torturedom failed
Trust list for WINBINDD_SHOW_SEQUENCE was:
BUILTIN
S4MEMBER
SAMBADOMAIN
torturedom
WARNING!: ../source4/torture/winbind/struct_based.c:812:
WINBINDD_SHOW_SEQUENCE returned 0, expected 1: WINBINDD_SHOW_SEQUENCE
WARNING!: WINBINDD_SHOW_SEQUENCE on domain TORTURE302 failed
Trust list for WINBINDD_SHOW_SEQUENCE was:
BUILTIN
S4MEMBER
SAMBADOMAIN
TORTURE302
TORTURE306
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Gary Lockyer <[email protected]>
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Tue May 29 02:31:40 CEST 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source4/torture/winbind/struct_based.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/winbind/struct_based.c
b/source4/torture/winbind/struct_based.c
index 7ea5aa7..9745b62 100644
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -816,11 +816,27 @@ static bool torture_winbind_struct_show_sequence(struct
torture_context *torture
"domain %s failed\n",
req.domain_name);
+ /*
+ * Only fail for the first two domain that we
+ * check specially below, otherwise we fail on
+ * trusts generated by the LSA torture test
+ * that do not really exist.
+ */
+ if (i > 1) {
+ /*
+ * Do not confirm the sequence numbers
+ * below
+ */
+ return true;
+ }
+
torture_comment(torture,
- "Trust list for "
- "WINBINDD_SHOW_SEQUENCE was:\n");
+ "Full trust list for "
+ "WINBINDD_SHOW_SEQUENCE "
+ "test was:\n");
for (i=0; domlist[i].netbios_name; i++) {
- torture_comment(torture, "%s\n",
+ torture_comment(torture,
+ "%s\n",
domlist[i].netbios_name);
}
--
Samba Shared Repository
