diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2016-08-15 20:54:53 +0200 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2016-08-15 20:54:53 +0200 |
| commit | f6babe9f2d05966903998909432e8b873b69192f (patch) | |
| tree | 0a86b5b92f4a8ee3e04f5039b5c1fc70842e6aa0 /httpd/logger.c | |
| parent | 5a83fddddbf34b5da95507bbca99427616d37f79 (diff) | |
| download | httpd-f6babe9f2d05966903998909432e8b873b69192f.tar.gz httpd-f6babe9f2d05966903998909432e8b873b69192f.zip | |
sync
Diffstat (limited to 'httpd/logger.c')
| -rw-r--r-- | httpd/logger.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/httpd/logger.c b/httpd/logger.c index 4d3b741..a212fb1 100644 --- a/httpd/logger.c +++ b/httpd/logger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logger.c,v 1.13 2015/08/20 13:00:23 reyk Exp $ */ +/* $OpenBSD: logger.c,v 1.15 2015/12/02 15:13:00 reyk Exp $ */ /* * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> @@ -70,6 +70,9 @@ logger_shutdown(void) void logger_init(struct privsep *ps, struct privsep_proc *p, void *arg) { + if (pledge("stdio recvfd", NULL) == -1) + fatal("pledge"); + if (config_init(ps->ps_env) == -1) fatal("failed to initialize configuration"); @@ -118,7 +121,7 @@ logger_open_file(const char *name) iov[1].iov_base = log->log_name; iov[1].iov_len = strlen(log->log_name) + 1; - if (proc_composev_imsg(env->sc_ps, PROC_PARENT, -1, IMSG_LOG_OPEN, -1, + if (proc_composev(env->sc_ps, PROC_PARENT, IMSG_LOG_OPEN, iov, 2) != 0) { log_warn("%s: failed to compose IMSG_LOG_OPEN imsg", __func__); goto err; @@ -188,7 +191,7 @@ logger_open_priv(struct imsg *imsg) return (-1); } - proc_compose_imsg(env->sc_ps, PROC_LOGGER, -1, IMSG_LOG_OPEN, fd, + proc_compose_imsg(env->sc_ps, PROC_LOGGER, -1, IMSG_LOG_OPEN, -1, fd, &id, sizeof(id)); DPRINTF("%s: opened log file %s, fd %d", __func__, path, fd); |