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/ctdbd.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/ctdbd.c')
| -rw-r--r-- | ctdb/server/ctdbd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index f19b48ff2ed..f3cb9d3e95f 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -53,6 +53,7 @@ static struct { int max_persistent_check_errors; } options = { .nlist = NULL, + .public_address_list = NULL, .transport = "tcp", .event_script_dir = NULL, .logfile = LOGDIR "/log.ctdb", @@ -322,6 +323,7 @@ int main(int argc, const char *argv[]) ctdb->do_setsched = 1; } + ctdb->public_addresses_file = options.public_address_list; ctdb->do_checkpublicip = !options.no_publicipcheck; if (options.max_persistent_check_errors < 0) { @@ -331,5 +333,5 @@ int main(int argc, const char *argv[]) } /* start the protocol running (as a child) */ - return ctdb_start_daemon(ctdb, interactive?false:true, options.use_syslog, options.public_address_list); + return ctdb_start_daemon(ctdb, interactive?false:true, options.use_syslog); } |