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.h | |
| 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.h')
| -rw-r--r-- | httpd.h | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -1,7 +1,7 @@ -/* $OpenBSD: httpd.h,v 1.66 2015/01/04 22:23:58 chrisz Exp $ */ +/* $OpenBSD: httpd.h,v 1.68 2015/01/16 06:40:17 deraadt Exp $ */ /* - * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org> + * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> * Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * @@ -23,7 +23,6 @@ #include <sys/tree.h> -#include <sys/param.h> /* MAXHOSTNAMELEN */ #include <limits.h> #include <imsg.h> #include <tls.h> @@ -361,11 +360,11 @@ TAILQ_HEAD(log_files, log_file) log_files; struct server_config { u_int32_t id; - char name[MAXHOSTNAMELEN]; + char name[HOST_NAME_MAX+1]; char location[NAME_MAX]; char index[NAME_MAX]; - char root[MAXPATHLEN]; - char socket[MAXPATHLEN]; + char root[PATH_MAX]; + char socket[PATH_MAX]; char accesslog[NAME_MAX]; char errorlog[NAME_MAX]; |