diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-10-21 19:33:10 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-10-22 15:37:54 +1100 |
| commit | f9ce563135ed036b48eb14a097e002c29aed97a7 (patch) | |
| tree | 850962de11b99927525fd6c08aa9aeb0fb6726d6 /ctdb/include/ctdb_private.h | |
| parent | 27a63433698604888a1c58becefa120b50eb8e14 (diff) | |
| download | samba-f9ce563135ed036b48eb14a097e002c29aed97a7.tar.gz | |
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/include/ctdb_private.h')
| -rw-r--r-- | ctdb/include/ctdb_private.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 13e482f2334..967dd63c9a0 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -549,6 +549,7 @@ struct ctdb_context { struct ctdb_reloadips_handle *reload_ips; + const char *nodes_file; const char *public_addresses_file; struct trbt_tree *child_processes; |