From 3c146be404affc894c0c702bbfbfcc4fb9ed902b Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Fri, 30 Mar 2018 14:28:46 -0700 Subject: [PATCH] nsswitch: Fix wbcListUsers test 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 Reviewed-by: Andreas Schneider --- nsswitch/libwbclient/tests/wbclient.c | 33 ++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c index e80afc4bd78..8c532bbaa75 100644 --- a/nsswitch/libwbclient/tests/wbclient.c +++ b/nsswitch/libwbclient/tests/wbclient.c @@ -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, -- 2.34.1