diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-01-18 15:07:18 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-01-18 15:07:18 +0100 |
| commit | 56cddace6a66b505f8e47b7117290ab1214aa84a (patch) | |
| tree | 4ac8affa66b5811f8791c3c371dc05c8d3c8cbc9 /httpd.c | |
| parent | faa9e65a23cdb2e3971b36d7a22fb9d04dabb52c (diff) | |
| download | httpd-56cddace6a66b505f8e47b7117290ab1214aa84a.tar.gz httpd-56cddace6a66b505f8e47b7117290ab1214aa84a.zip | |
sync with -current:
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'httpd.c')
| -rw-r--r-- | httpd.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.c,v 1.28 2014/12/11 17:06:55 schwarze Exp $ */ +/* $OpenBSD: httpd.c,v 1.29 2015/01/16 06:40:17 deraadt Exp $ */ /* * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> @@ -16,12 +16,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> /* nitems */ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/wait.h> #include <sys/resource.h> +#include <sys/signal.h> #include <net/if.h> #include <netinet/in.h> @@ -42,6 +44,8 @@ #include "httpd.h" +#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) + __dead void usage(void); int parent_configure(struct httpd *); @@ -678,7 +682,7 @@ socket_rlimit(int maxfd) if (maxfd == -1) rl.rlim_cur = rl.rlim_max; else - rl.rlim_cur = MAX(rl.rlim_max, (rlim_t)maxfd); + rl.rlim_cur = MAXIMUM(rl.rlim_max, (rlim_t)maxfd); if (setrlimit(RLIMIT_NOFILE, &rl) == -1) fatal("socket_rlimit: failed to set resource limit"); } |