ctdb-config: Switch tunable DisableIPFailover to a config option

[vlendec/samba-autobuild/.git] / ctdb / server / ctdb_config.c

diff --git a/ctdb/server/ctdb_config.c b/ctdb/server/ctdb_config.c
index f00c3268085a025b2fc7f5eb8ea09dc75c1abe43..750b909cd3df5b21c3a1f19dcad51348235cb437 100644 (file)
--- a/ctdb/server/ctdb_config.c
+++ b/ctdb/server/ctdb_config.c
@@ -28,6 +28,7 @@
 #include "cluster/cluster_conf.h"
 #include "database/database_conf.h"
 #include "event/event_conf.h"
+#include "failover/failover_conf.h"
 #include "legacy_conf.h"
 
 #include "ctdb_config.h"
@@ -86,6 +87,14 @@ static void setup_config_pointers(struct conf_context *conf)
                                   EVENT_CONF_DEBUG_SCRIPT,
                                   &ctdb_config.event_debug_script);
 
+       /*
+        * Failover
+        */
+       conf_assign_boolean_pointer(conf,
+                                   FAILOVER_CONF_SECTION,
+                                   FAILOVER_CONF_DISABLED,
+                                   &ctdb_config.failover_disabled);
+
        /*
         * Legacy
         */
@@ -132,6 +141,7 @@ int ctdbd_config_load(TALLOC_CTX *mem_ctx,
        cluster_conf_init(conf);
        database_conf_init(conf);
        event_conf_init(conf);
+       failover_conf_init(conf);
        legacy_conf_init(conf);
 
        setup_config_pointers(conf);