summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-28 19:01:54 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-31 12:17:34 +0200
commitfd8cf63811bbf8fbe40bc1098ab089aceb4711f9 (patch)
tree11f866364f49e0e32d4ac06a1936db77b338f307
parent3ea216f888879e3a0a3beffa66e5132bdb4569e3 (diff)
downloadsamba-fd8cf63811bbf8fbe40bc1098ab089aceb4711f9.tar.gz
samba-fd8cf63811bbf8fbe40bc1098ab089aceb4711f9.tar.bz2
samba-fd8cf63811bbf8fbe40bc1098ab089aceb4711f9.zip
wbinfo: use wbcPing()
metze (This used to be commit 9a2f0b21925e630fa9b268cedbc19cf814686b42)
-rw-r--r--source3/nsswitch/wbinfo.c12
1 files 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 */