sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

nsswitch: Fix wbcListUsers test

Browse Source 
With an AD DC, wbcListUsers returns the users in the DOMAIN SEPARATOR
USERNAME format.  The test then calls wbcLookupName with the domain name
and the previous string (including domain and separator) as username.
Fix this by passing the correct username and adding some additional
checks.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13312

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Christof Schmitt 2018-03-30 14:28:46 -07:00 committed by Andreas Schneider
parent 6f07afad07
commit 3c146be404
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nsswitch/libwbclient/tests/wbclient.c
View File

@ -296,6 +296,7 @@ static bool test_wbc_users(struct torture_context *tctx)
char *name = NULL;
char *sid_string = NULL;
wbcErr ret = false;
char separator;
torture_assert_wbc_ok(tctx, wbcInterfaceDetails(&details),
"%s", "wbcInterfaceDetails failed");
@ -306,6 +307,7 @@ static bool test_wbc_users(struct torture_context *tctx)
ret,
fail,
"Failed to allocate domain_name");
separator = details->winbind_separator;
wbcFreeMemory(details);
details = NULL;
@ -323,9 +325,38 @@ static bool test_wbc_users(struct torture_context *tctx)
struct wbcDomainSid sid;
enum wbcSidType name_type;
uint32_t num_sids;
const char *user;
char *c;
c = strchr(users[i], separator);
if (c == NULL) {
/*
* NT4 DC
* user name does not contain DOMAIN SEPARATOR prefix.
*/
user = users[i];
} else {
/*
* AD DC
* user name starts with DOMAIN SEPARATOR prefix.
*/
const char *dom;
*c = '\0';
dom = users[i];
user = c + 1;
torture_assert_str_equal_goto(tctx, dom, domain_name,
ret, fail, "Domain part "
"of user name does not "
"match domain name.\n");
}
torture_assert_wbc_ok_goto_fail(tctx,
wbcLookupName(domain_name, users[i], &sid, &name_type),
wbcLookupName(domain_name, user,
&sid, &name_type),
"wbcLookupName of %s failed",
users[i]);
torture_assert_int_equal_goto(tctx,