From 230cb3b90435d951beb62d8dd5230f74e178f921 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 28 May 2011 20:54:33 +0200
Subject: s3: Use cli_connect_nb in smbd_running()

---
 source3/web/diagnose.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index d5c5e90d49..d73337ca84 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -70,15 +70,11 @@ bool smbd_running(void)
 	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
 	in_addr_to_sockaddr_storage(&ss, loopback_ip);
 
-	if ((cli = cli_initialise()) == NULL)
-		return False;
-
-	status = cli_connect(cli, global_myname(), &ss);
+	status = cli_connect_nb("localhost", &ss, 0, 0x20, global_myname(),
+				Undefined, &cli);
 	if (!NT_STATUS_IS_OK(status)) {
-		cli_shutdown(cli);
-		return False;
+		return false;
 	}
-
 	cli_shutdown(cli);
 	return True;
 }
-- 
cgit