diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-10-21 19:52:01 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-10-22 15:37:54 +1100 |
| commit | e782b61732bd199ff6803c7fa47ee8efb6f6baf4 (patch) | |
| tree | ee4cda8e89209b4b446e30d2e02286a6aa8e686e /ctdb/server/ctdb_daemon.c | |
| parent | 463a091a7778211a29331d0d4e34b3d5b16e73cb (diff) | |
| download | samba-e782b61732bd199ff6803c7fa47ee8efb6f6baf4.tar.gz samba-e782b61732bd199ff6803c7fa47ee8efb6f6baf4.tar.xz samba-e782b61732bd199ff6803c7fa47ee8efb6f6baf4.zip | |
ctdbd: Pass the public address file location in ctdb context
No need to pass it as an extra argument to ctdb_start_daemon.
Also ensure options.public_address_list gets a nice static default.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit a3d63a9db89d08bb284b3b3a6db773422f21b477)
Diffstat (limited to 'ctdb/server/ctdb_daemon.c')
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 92dc8de59d0..cbe6b23ce0e 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1145,7 +1145,7 @@ static void ctdb_create_pidfile(pid_t pid) /* start the protocol going as a daemon */ -int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog, const char *public_address_list) +int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog) { int res, ret = -1; struct fd_event *fde; @@ -1261,8 +1261,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog, initialise_node_flags(ctdb); - if (public_address_list) { - ctdb->public_addresses_file = public_address_list; + if (ctdb->public_addresses_file) { ret = ctdb_set_public_addresses(ctdb, true); if (ret == -1) { DEBUG(DEBUG_ALERT,("Unable to setup public address list\n")); |