From: Volker Lendecke Date: Sat, 15 Jul 2017 08:52:17 +0000 (+0200) Subject: ntlm_auth: Use libwbclient in winbind_separator() X-Git-Tag: talloc-2.1.11~480 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5781cefc427b3f9f89b4470c1504ab941fa5334e;p=thirdparty%2Fsamba.git ntlm_auth: Use libwbclient in winbind_separator() Avoid direct winbindd_request_response() Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 5a10e27719f..faba67c3b29 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -280,24 +280,24 @@ static void gensec_want_feature_list(struct gensec_security *state, char* featur static char winbind_separator(void) { - struct winbindd_response response; + struct wbcInterfaceDetails *details; + wbcErr ret; static bool got_sep; static char sep; if (got_sep) return sep; - ZERO_STRUCT(response); - - /* Send off request */ - - if (winbindd_request_response(NULL, WINBINDD_INFO, NULL, &response) != - NSS_STATUS_SUCCESS) { + ret = wbcInterfaceDetails(&details); + if (!WBC_ERROR_IS_OK(ret)) { d_fprintf(stderr, "could not obtain winbind separator!\n"); return *lp_winbind_separator(); } - sep = response.data.info.winbind_separator; + sep = details->winbind_separator; + + wbcFreeMemory(details); + got_sep = True; if (!sep) {