diff --git a/src/addclub.c b/src/addclub.c index 4174b07..28306d1 100644 --- a/src/addclub.c +++ b/src/addclub.c @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) { int ret; prog = xstrdup(basename(argv[0])); - init_log(prog, LOG_PID, LOG_AUTHPRIV); + init_log(prog, LOG_PID, LOG_AUTHPRIV, 1); configure(); diff --git a/src/addmember.c b/src/addmember.c index 506f707..92b963c 100644 --- a/src/addmember.c +++ b/src/addmember.c @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) { int ret; prog = xstrdup(basename(argv[0])); - init_log(prog, LOG_PID, LOG_AUTHPRIV); + init_log(prog, LOG_PID, LOG_AUTHPRIV, 1); configure(); diff --git a/src/ceoc.c b/src/ceoc.c index 8ae7320..d6ada68 100644 --- a/src/ceoc.c +++ b/src/ceoc.c @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) { char *op; prog = xstrdup(basename(argv[0])); - init_log(prog, LOG_PID, LOG_USER); + init_log(prog, LOG_PID, LOG_USER, 1); configure(); setup_ops(); diff --git a/src/dmaster.c b/src/dmaster.c index 4751fb7..86fea47 100644 --- a/src/dmaster.c +++ b/src/dmaster.c @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) { int ret; prog = xstrdup(basename(argv[0])); - init_log(prog, LOG_PID, LOG_DAEMON); + init_log(prog, LOG_PID, LOG_DAEMON, 0); configure(); diff --git a/src/op-adduser.c b/src/op-adduser.c index e9a05c0..060f385 100644 --- a/src/op-adduser.c +++ b/src/op-adduser.c @@ -282,7 +282,7 @@ void cmd_adduser(void) { int main(int argc, char *argv[]) { prog = xstrdup(basename(argv[0])); - init_log(prog, LOG_PID, LOG_AUTHPRIV); + init_log(prog, LOG_PID, LOG_AUTHPRIV, 0); configure(); diff --git a/src/util.c b/src/util.c index 6b0a5b4..8d90d8c 100644 --- a/src/util.c +++ b/src/util.c @@ -14,9 +14,9 @@ static int log_stderr = 1; -void init_log(const char *ident, int option, int facility) { +void init_log(const char *ident, int option, int facility, int lstderr) { openlog(ident, option, facility); - log_stderr = isatty(STDERR_FILENO); + log_stderr = lstderr || isatty(STDERR_FILENO); } static void errmsg(int prio, const char *prefix, const char *fmt, va_list args) { diff --git a/src/util.h b/src/util.h index 70fc82d..c0dce50 100644 --- a/src/util.h +++ b/src/util.h @@ -33,7 +33,7 @@ ssize_t full_read(int fd, void *buf, size_t len); FILE *fopenat(DIR *d, const char *path, int flags); void make_env(char **envp, ...); void free_env(char **envp); -void init_log(const char *ident, int option, int facility); +void init_log(const char *ident, int option, int facility, int lstderr); int check_group(char *username, char *group); PRINTF_LIKE(0) NORETURN void fatal(const char *, ...);