diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-12-11 08:52:59 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-12-14 23:26:40 +0100 |
| commit | 203f0233827e620eb89d68f7e9d2a72e0fbecafd (patch) | |
| tree | 13ccd3e092d615f842eccb571c5a1502a7fdb669 /source4/torture/winbind | |
| parent | 79f946cdb6733ccd616e6add8dab9f759937d6e5 (diff) | |
| download | samba-203f0233827e620eb89d68f7e9d2a72e0fbecafd.tar.gz | |
s4:torture/winbind: add more debug output to samba4.winbind.struct.domain_info
With this we hopefully find the reason for the following flakey test:
[1566(10157)/1882 at 1h47m18s] samba4.winbind.struct(ad_member:local)
Running WINBINDD_DOMAIN_INFO (struct based)
DOMAIN 'BUILTIN' => '' [ ] [S-1-5-32]
DOMAIN 'LOCALADMEMBER' => '' [ ] [S-1-5-21-4121020324-2900821022-46155812]
DOMAIN 'SAMBADOMAIN' => 'samba.example.com' [ PR AD NA ] [S-1-5-21-929009974-669086582-3038401809]
DOMAIN 'TORTURE300' => 'torturedom300.samba._none_.example.com' [ AD NA ] [S-1-5-21-97398-379795-300]
DOMAIN 'TORTURE301' => 'torturedom301.samba._none_.example.com' [ AD NA ] [S-1-5-21-97398-379795-301]
DOMAIN 'TORTURE302' => 'torturedom302.samba._none_.example.com' [ AD NA ] [S-1-5-21-97398-379795-302]
DOMAIN 'TORTURE303' => 'torturedom303.samba._none_.example.com' [ AD NA ] [S-0-0]
UNEXPECTED(failure): samba4.winbind.struct.domain_info(ad_member:local)
REASON: Exception: Exception: ../source4/torture/winbind/struct_based.c:460:
Expression `ok' failed: SID's doesn't match
With the changes we get:
[1566(10158)/1882 at 1h47m51s] samba4.winbind.struct(ad_member:local)
Running WINBINDD_DOMAIN_INFO (struct based)
LIST[0] 'BUILTIN' => '' [S-1-5-32]
LIST[1] 'LOCALADMEMBER' => '' [S-1-5-21-734569583-677146317-1850798319]
LIST[2] 'SAMBADOMAIN' => 'samba.example.com' [S-1-5-21-1870621479-3245899124-866531092]
LIST[3] 'TORTURE300' => 'torturedom300.samba._none_.example.com' [S-1-5-21-97398-379795-300]
LIST[4] 'TORTURE301' => 'torturedom301.samba._none_.example.com' [S-1-5-21-97398-379795-301]
LIST[5] 'TORTURE302' => 'torturedom302.samba._none_.example.com' [S-1-5-21-97398-379795-302]
LIST[6] 'TORTURE303' => 'torturedom303.samba._none_.example.com' [S-1-0-0]
LIST[7] 'TORTURE304' => 'torturedom304.samba._none_.example.com' [S-1-0-0]
LIST[8] 'TORTURE305' => 'torturedom305.samba._none_.example.com' [S-1-0-0]
LIST[9] 'TORTURE306' => 'torturedom306.samba._none_.example.com' [S-1-5-21-97398-379795-306]
LIST[10] 'TORTURE307' => 'torturedom307.samba._none_.example.com' [S-1-5-21-97398-379795-307]
LIST[11] 'TORTURE308' => 'torturedom308.samba._none_.example.com' [S-1-5-21-97398-379795-308]
LIST[12] 'TORTURE309' => 'torturedom309.samba._none_.example.com' [S-1-5-21-97398-379795-309]
LIST[13] 'TORTURE310' => 'torturedom310.samba._none_.example.com' [S-1-5-21-97398-379795-310]
LIST[14] 'TORTURE311' => 'torturedom311.samba._none_.example.com' [S-1-5-21-97398-379795-311]
DOMAIN[0] 'BUILTIN' => '' [ ] [S-1-5-32]
DOMAIN[1] 'LOCALADMEMBER' => '' [ ] [S-1-5-21-734569583-677146317-1850798319]
DOMAIN[2] 'SAMBADOMAIN' => 'samba.example.com' [ PR AD NA ] [S-1-5-21-1870621479-3245899124-866531092]
DOMAIN[3] 'TORTURE300' => 'torturedom300.samba._none_.example.com' [ AD NA ] [S-1-5-21-97398-379795-300]
DOMAIN[4] 'TORTURE301' => 'torturedom301.samba._none_.example.com' [ AD NA ] [S-1-5-21-97398-379795-301]
DOMAIN[5] 'TORTURE302' => 'torturedom302.samba._none_.example.com' [ AD NA ] [S-1-5-21-97398-379795-302]
DOMAIN[6] 'TORTURE303' => 'torturedom303.samba._none_.example.com' [ AD NA ] [S-0-0]
UNEXPECTED(failure): samba4.winbind.struct.domain_info(ad_member:local)
REASON: Exception: Exception: ../source4/torture/winbind/struct_based.c:471: Expression `ok' failed: SID's doesn't match [S-1-0-0] != [S-0-0]
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Dec 14 23:26:40 CET 2015 on sn-devel-104
Diffstat (limited to 'source4/torture/winbind')
| -rw-r--r-- | source4/torture/winbind/struct_based.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index a7b6bfd8e35..1a84a7a2c2d 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -417,6 +417,14 @@ static bool torture_winbind_struct_domain_info(struct torture_context *torture) torture_assert(torture, ok, "failed to get trust list"); for (i=0; listd && listd[i].netbios_name; i++) { + torture_comment(torture, "LIST[%u] '%s' => '%s' [%s]\n", + (unsigned)i, + listd[i].netbios_name, + listd[i].dns_name, + dom_sid_string(torture, listd[i].sid)); + } + + for (i=0; listd && listd[i].netbios_name; i++) { struct winbindd_request req; struct winbindd_response rep; struct dom_sid *sid; @@ -447,7 +455,8 @@ static bool torture_winbind_struct_domain_info(struct torture_context *torture) flagstr = talloc_strdup_append(flagstr, "NA "); } - torture_comment(torture, "DOMAIN '%s' => '%s' [%s] [%s]\n", + torture_comment(torture, "DOMAIN[%u] '%s' => '%s' [%s] [%s]\n", + (unsigned)i, rep.data.domain_info.name, rep.data.domain_info.alt_name, flagstr, @@ -457,7 +466,9 @@ static bool torture_winbind_struct_domain_info(struct torture_context *torture) torture_assert(torture, sid, "Failed to parse SID"); ok = dom_sid_equal(listd[i].sid, sid); - torture_assert(torture, ok, "SID's doesn't match"); + torture_assert(torture, ok, talloc_asprintf(torture, "SID's doesn't match [%s] != [%s]", + dom_sid_string(torture, listd[i].sid), + dom_sid_string(torture, sid))); torture_assert_str_equal(torture, rep.data.domain_info.name, |