Undo damage done by d8d37493478a26c5f1809a5f3df89ffd6e149281
authorMartin Schwenke <martin@meltin.net>
Thu, 22 Mar 2012 04:27:25 +0000 (15:27 +1100)
committerMichael Adam <obnox@samba.org>
Fri, 6 Jun 2014 13:00:36 +0000 (15:00 +0200)
commitf65fe7815574cbfe12b0d6fb353e2fb4f4dbfdea
tree5c7a0f3b448bc7602d8fcf46d4a2753a723bffd9
parentdb0cf14308b193d8678600c28e50e770b7b304a9
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>
(cherry picked from commit 5083b266dd68b292c4275505f3d1b878dbf12f11)

Conflicts:

include/ctdb_private.h
include/ctdb_private.h
server/ctdb_recoverd.c
server/ctdbd.c