s3:winbindd: use cluster_probe_ok()
authorMichael Adam <obnox@samba.org>
Thu, 17 Oct 2013 13:16:19 +0000 (15:16 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 17 Oct 2013 21:22:50 +0000 (23:22 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/winbindd/winbindd.c

index b8b9c21170f56f332e9e2e1b88dfa2a4dc29235c..361d02c03bd0ff0373c7c74229790f2b8e9a684b 100644 (file)
@@ -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 */