From 2b302791695fe29af369c3c17dc740f45d3cadd9 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Fri, 16 Feb 2007 19:49:12 +0000 Subject: r21396: fix wbinfo --lookup-rids command allow detection of libbiconv if all others fail - need for FreeBSD (This used to be commit 7acc9421b0643cb04bff1f1d98ecb899f9b09601) --- source3/nsswitch/wb_common.c | 2 +- source3/nsswitch/wbinfo.c | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'source3/nsswitch') diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c index 05d2a660e7..13cefd135d 100644 --- a/source3/nsswitch/wb_common.c +++ b/source3/nsswitch/wb_common.c @@ -504,7 +504,7 @@ int read_reply(struct winbindd_response *response) /* Mallocate memory for extra data */ - if (!(response->extra_data.data = malloc(extra_data_len))) { + if (!(response->extra_data.data = SMB_MALLOC(extra_data_len))) { return -1; } diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index cabf995042..826b4fc040 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -638,7 +638,7 @@ static BOOL wbinfo_lookupsid(char *sid) /* Lookup a list of RIDs */ -static BOOL wbinfo_lookuprids(char *domain_sid, char *arg) +static BOOL wbinfo_lookuprids(char *domain, char *arg) { size_t i; DOM_SID sid; @@ -650,9 +650,24 @@ static BOOL wbinfo_lookuprids(char *domain_sid, char *arg) enum lsa_SidType *types; const char *domain_name; TALLOC_CTX *mem_ctx; + struct winbindd_request request; + struct winbindd_response response; + + if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0')) + fstrcpy(request.domain_name, get_winbind_domain()); + else + fstrcpy(request.domain_name, domain); + + /* Send request */ + + if (winbindd_request_response(WINBINDD_DOMAIN_INFO, &request, &response) != + NSS_STATUS_SUCCESS) { + d_printf("Could not get domain sid for %s\n", request.domain_name); + return False; + } - if (!string_to_sid(&sid, domain_sid)) { - d_printf("Could not convert %s to sid\n", domain_sid); + if (!string_to_sid(&sid, response.data.domain_info.sid)) { + d_printf("Could not convert %s to sid\n", response.data.domain_info.sid); return False; } -- cgit