From fd8cf63811bbf8fbe40bc1098ab089aceb4711f9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 28 Mar 2008 19:01:54 +0100 Subject: wbinfo: use wbcPing() metze (This used to be commit 9a2f0b21925e630fa9b268cedbc19cf814686b42) --- source3/nsswitch/wbinfo.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 15d6ae2dab..7a68b3c838 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -27,8 +27,6 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -extern int winbindd_fd; - static char winbind_separator_int(bool strict) { struct winbindd_response response; @@ -1224,16 +1222,16 @@ static void wbinfo_get_auth_user(void) static bool wbinfo_ping(void) { - NSS_STATUS result; + wbcErr wbc_status; - result = winbindd_request_response(WINBINDD_PING, NULL, NULL); + wbc_status = wbcPing(); /* Display response */ - d_printf("Ping to winbindd %s on fd %d\n", - (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", winbindd_fd); + d_printf("Ping to winbindd %s\n", + WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed"); - return result == NSS_STATUS_SUCCESS; + return WBC_ERROR_IS_OK(wbc_status); } /* Main program */ -- cgit