diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-03-22 15:27:25 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-03-22 15:34:52 +1100 |
| commit | fbe64dec018afec3ca56b3fd90eb4dc4e3d53d15 (patch) | |
| tree | ccadbb9887dcf62071ea2fde07ec6a26a9e9d0c7 /ctdb/server/ctdbd.c | |
| parent | 430cbcc30b9fb20318fedef022ce5329a9972fa4 (diff) | |
| download | samba-fbe64dec018afec3ca56b3fd90eb4dc4e3d53d15.tar.gz | |
Undo damage done by d8d37493478a26c5f1809a5f3df89ffd6e149281
The implementation of DisableIPFailover got intermingled with
--nopublicipcheck. This just looks wrong - Ronnie must have been
having a bad day. :-)
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 5083b266dd68b292c4275505f3d1b878dbf12f11)
Diffstat (limited to 'ctdb/server/ctdbd.c')
| -rw-r--r-- | ctdb/server/ctdbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index a8d956d8658..4205bd227b0 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -209,8 +209,6 @@ int main(int argc, const char *argv[]) ctdb_tunables_set_defaults(ctdb); - ctdb->tunable.disable_ip_failover = options.no_publicipcheck; - ret = ctdb_set_recovery_lock_file(ctdb, options.recovery_lock_file); if (ret == -1) { DEBUG(DEBUG_ALERT,("ctdb_set_recovery_lock_file failed - %s\n", ctdb_errstr(ctdb))); @@ -323,6 +321,8 @@ int main(int argc, const char *argv[]) ctdb->do_setsched = 1; } + ctdb->do_checkpublicip = !options.no_publicipcheck; + if (options.max_persistent_check_errors < 0) { ctdb->max_persistent_check_errors = 0xFFFFFFFFFFFFFFFFLL; } else { |