From 8e26870e15b46db20634fdef4815e6acdc8beb4b Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 5 Jul 2015 00:51:29 +0100 Subject: Fix logging to stderr if verbose_log was set before nslog_init was called --- utils/log.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/log.c b/utils/log.c index cc3f7a8df..43bfbd522 100644 --- a/utils/log.c +++ b/utils/log.c @@ -69,9 +69,9 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) /* remove -V and filename from argv list */ for (argcmv = 3; argcmv < (*pargc); argcmv++) { - argv[argcmv - 1] = argv[argcmv]; + argv[argcmv - 2] = argv[argcmv]; } - (*pargc)--; + (*pargc) -= 2; if (logfile == NULL) { /* could not open log file for output */ @@ -82,6 +82,9 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) /* ensure we actually show logging */ verbose_log = true; } + } else if (verbose_log == true) { + /* default is logging to stderr */ + logfile = stderr; } /* ensure output file handle is correctly configured */ -- cgit v1.2.3