diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-05-15 20:13:20 +0200 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-05-15 20:13:20 +0200 |
| commit | fbefc9a818a5ed612c0df918598057a8b551cb95 (patch) | |
| tree | c072ec2d257394bb11fb1c75f43d040059245c4e /httpd/config.c | |
| parent | 89b8c998b9e87423cc1cdec8603294765f6a0332 (diff) | |
| download | httpd-fbefc9a818a5ed612c0df918598057a8b551cb95.tar.gz httpd-fbefc9a818a5ed612c0df918598057a8b551cb95.zip | |
sync
Diffstat (limited to 'httpd/config.c')
| -rw-r--r-- | httpd/config.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/httpd/config.c b/httpd/config.c index 2dc9159..7635c33 100644 --- a/httpd/config.c +++ b/httpd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.36 2015/02/23 11:48:41 reyk Exp $ */ +/* $OpenBSD: config.c,v 1.37 2015/04/11 14:52:49 jsing Exp $ */ /* * Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -212,12 +212,22 @@ config_setserver(struct httpd *env, struct server *srv) fd = -1; else if ((fd = dup(srv->srv_s)) == -1) return (-1); - proc_composev_imsg(ps, id, n, - IMSG_CFG_SERVER, fd, iov, c); + if (proc_composev_imsg(ps, id, n, + IMSG_CFG_SERVER, fd, iov, c) != 0) { + log_warn("%s: failed to compose " + "IMSG_CFG_SERVER imsg for `%s'", + __func__, srv->srv_conf.name); + return (-1); + } } } else { - proc_composev_imsg(ps, id, -1, IMSG_CFG_SERVER, -1, - iov, c); + if (proc_composev_imsg(ps, id, -1, IMSG_CFG_SERVER, -1, + iov, c) != 0) { + log_warn("%s: failed to compose " + "IMSG_CFG_SERVER imsg for `%s'", + __func__, srv->srv_conf.name); + return (-1); + } } } |