diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-11-15 11:17:36 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-11-15 11:17:36 +0200 |
| commit | 2cec73c97140588cadad597391be6c13ee0ab2da (patch) | |
| tree | 08eba8c87b786027c91dd3c9b570767ce0688c3c /src/nssync.c | |
| parent | 82ee306d977e2fcb88277b85920b7863ead36312 (diff) | |
| download | nssync-master.tar.gz nssync-master.tar.bz2 | |
* grecs: Update.
* src/cmdline.opt: New option --pidfile
* src/nssync.c: Pidfile from command line overrides that from configuration.
* src/config.c (config_parse): Fix coredump on empty synclist
Diffstat (limited to 'src/nssync.c')
| -rw-r--r-- | src/nssync.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nssync.c b/src/nssync.c index d10ce05..8f4fad2 100644 --- a/src/nssync.c +++ b/src/nssync.c @@ -30,6 +30,7 @@ int debug_level; char *config_file = SYSCONFDIR "/nssync.conf"; char *slave_status_file; char *pidfile; +char *cli_pidfile; int force; char *tempdir; char *reload_command = "/usr/sbin/rndc reload"; @@ -702,6 +703,9 @@ main(int argc, char **argv) EX_CONFIG : 0); config_parse(); + if (cli_pidfile) + pidfile = cli_pidfile; + check_pidfile(); if (check_ns) |