sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

torture-winbind: Assert that the list of trusted domains is not NULL

Browse Source 
By doing this, we avoid the test being dependent on if the lsa trusted domains tests have run.

Otherwise, we may have a non-null extra_data against the internal winbind, but
only 1 trusted domain (torturedom), but not the local domains that were expected

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2015-04-28 14:20:35 +12:00
parent 406cd32126
commit a62e78cef6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/torture/winbind/struct_based.c
View File

@ -285,11 +285,10 @@ static bool get_trusted_domains(struct torture_context *torture,
DO_STRUCT_REQ_REP(WINBINDD_LIST_TRUSTDOM, &req, &rep);
extra_data = (char *)rep.extra_data.data;
if (!extra_data) {
return true;
}
torture_assert(torture, extra_data, "NULL trust list");
torture_assert(torture, extra_data != NULL,
"Trust list was NULL: the list of trusted domain "
"should be returned, with at least 2 entries "
"(BUILTIN, and the local domain)");
while (next_token(&extra_data, line, "\n", sizeof(line))) {
char *p, *lp;
@ -324,7 +323,8 @@ static bool get_trusted_domains(struct torture_context *torture,
SAFE_FREE(rep.extra_data.data);
torture_assert(torture, dcount >= 2,
"The list of trusted domain should contain 2 entries");
"The list of trusted domain should contain 2 entries "
"(BUILTIN, and the local domain)");
*_d = d;
return true;