From: Michael Adam <obnox@samba.org>
Date: Thu, 17 Oct 2013 13:16:19 +0000 (+0200)
Subject: s3:winbindd: use cluster_probe_ok()
X-Git-Url: http://git.samba.org/?p=mat%2Fsamba.git;a=commitdiff_plain;h=5eae612c724339b225de8be9057dab4043a625a5

s3:winbindd: use cluster_probe_ok()

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index b8b9c21170..361d02c03b 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -37,7 +37,7 @@
 #include "auth.h"
 #include "messages.h"
 #include "../lib/util/pidfile.h"
-#include "ctdbd_conn.h"
+#include "util_cluster.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -1465,15 +1465,8 @@ int main(int argc, char **argv, char **envp)
 		exit(1);
 	}
 
-	if (lp_clustering()) {
-		NTSTATUS status;
-
-		status = ctdbd_probe();
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(0, ("clustering=yes but ctdbd connect failed: "
-				  "%s\n", nt_errstr(status)));
-			exit(1);
-		}
+	if (!cluster_probe_ok()) {
+		exit(1);
 	}
 
 	/* Initialise messaging system */