summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-10-17 15:16:19 +0200
committerMichael Adam <obnox@samba.org>2013-10-17 23:22:50 +0200
commit5eae612c724339b225de8be9057dab4043a625a5 (patch)
tree26b42f9972bd02fc7e3f369e882b7fdc759d74b0
parent0c21676bed38eced1130130f82d7979e8b7bfd08 (diff)
downloadsamba-5eae612c724339b225de8be9057dab4043a625a5.tar.gz
samba-5eae612c724339b225de8be9057dab4043a625a5.tar.bz2
samba-5eae612c724339b225de8be9057dab4043a625a5.zip
s3:winbindd: use cluster_probe_ok()
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
-rw-r--r--source3/winbindd/winbindd.c13
1 files changed, 3 insertions, 10 deletions
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 */