From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 28 Mar 2008 18:01:54 +0000 (+0100)
Subject: wbinfo: use wbcPing()
X-Git-Tag: samba-3.3.0pre1~3009
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a2f0b21925e630fa9b268cedbc19cf814686b42;p=thirdparty%2Fsamba.git

wbinfo: use wbcPing()

metze
---

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 15d6ae2dab2..7a68b3c838a 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/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 */