summaryrefslogtreecommitdiff
path: root/logger.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2015-01-18 15:07:18 +0100
committerReyk Floeter <reyk@esdenera.com>2015-01-18 15:07:18 +0100
commit56cddace6a66b505f8e47b7117290ab1214aa84a (patch)
tree4ac8affa66b5811f8791c3c371dc05c8d3c8cbc9 /logger.c
parentfaa9e65a23cdb2e3971b36d7a22fb9d04dabb52c (diff)
downloadhttpd-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 'logger.c')
-rw-r--r--logger.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/logger.c b/logger.c
index 672f3b8..ee21585 100644
--- a/logger.c
+++ b/logger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logger.c,v 1.8 2014/12/21 00:54:49 guenther Exp $ */
+/* $OpenBSD: logger.c,v 1.9 2015/01/16 06:40:17 deraadt Exp $ */
/*
* Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -16,6 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/param.h> /* nitems */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/queue.h>
@@ -152,7 +153,7 @@ logger_open_fd(struct imsg *imsg)
int
logger_open_priv(struct imsg *imsg)
{
- char path[MAXPATHLEN];
+ char path[PATH_MAX];
char name[NAME_MAX], *p;
u_int32_t id;
size_t len;