summaryrefslogtreecommitdiffstats
path: root/ctdb/tests/src
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-10-21 19:33:10 +1100
committerMartin Schwenke <martin@meltin.net>2013-10-22 15:37:54 +1100
commitf9ce563135ed036b48eb14a097e002c29aed97a7 (patch)
tree850962de11b99927525fd6c08aa9aeb0fb6726d6 /ctdb/tests/src
parent27a63433698604888a1c58becefa120b50eb8e14 (diff)
downloadsamba-f9ce563135ed036b48eb14a097e002c29aed97a7.tar.gz
samba-f9ce563135ed036b48eb14a097e002c29aed97a7.tar.xz
samba-f9ce563135ed036b48eb14a097e002c29aed97a7.zip
ctdbd: Add nodes_file member to struct ctdb_context
This allows ctdb_load_nodes_file() to move to ctdb_server.c and ctdb_set_nlist() to become static. Setting ctdb->nodes_file needs to be done early, before the nodes file is loaded. It is now set from CTDB_BASE instead ETCDIR, so setting CTDB_BASE also needs to be done earlier. Unhack ctdbd_test.c - it no longer needs to define ctdb_load_nodes_file(). Signed-off-by: Martin Schwenke <martin@meltin.net> Pair-programmed-with: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit 20e705e63bd3b20837cc3ac92fdcf2a9650ccfc8)
Diffstat (limited to 'ctdb/tests/src')
-rw-r--r--ctdb/tests/src/ctdbd_test.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c
index bf95e0b84f..fb29ba8f1b 100644
--- a/ctdb/tests/src/ctdbd_test.c
+++ b/ctdb/tests/src/ctdbd_test.c
@@ -30,8 +30,6 @@
*/
int script_log_level;
bool fast_start;
-void ctdb_load_nodes_file(struct ctdb_context *ctdb) {}
-
/* UTIL_OBJ */
#include "lib/util/idtree.c"