diff options
| author | Michael Adam <obnox@samba.org> | 2013-10-17 15:15:51 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-10-17 23:22:29 +0200 |
| commit | 0c21676bed38eced1130130f82d7979e8b7bfd08 (patch) | |
| tree | 2fc85f62ab48d5908f080521d0271b386430a1c1 | |
| parent | 972c8318129f0397b66a62f7f9c355a5df04d7b4 (diff) | |
| download | samba-0c21676bed38eced1130130f82d7979e8b7bfd08.tar.gz samba-0c21676bed38eced1130130f82d7979e8b7bfd08.tar.xz samba-0c21676bed38eced1130130f82d7979e8b7bfd08.zip | |
s3:smbd: use new function cluster_probe_ok()
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | source3/smbd/server.c | 12 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 3536f18cf4..8173a6294d 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -31,6 +31,7 @@ #include "secrets.h" #include "memcache.h" #include "ctdbd_conn.h" +#include "util_cluster.h" #include "printing/queue_process.h" #include "rpc_server/rpc_service_setup.h" #include "rpc_server/rpc_config.h" @@ -1214,15 +1215,8 @@ extern void build_options(bool screen); 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); } /* Init the security context and global current_user */ diff --git a/source3/wscript_build b/source3/wscript_build index dd2e054e53..4803e9b13e 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -285,6 +285,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core', lib/ctdb_packet.c lib/ctdbd_conn.c lib/ctdb_conn.c + lib/util_cluster.c lib/msg_channel.c lib/id_cache.c lib/talloc_dict.c |