diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-01-16 06:40:12 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-16 18:24:48 +1100 |
| commit | 2ae4f337b2a5fb2841b6b0053b49496fef844d1c (patch) | |
| tree | 59aac6ef59be3975eb3a1251abb0be330c008cdd /servconf.c | |
| parent | 3c4726f4c24118e8f1bb80bf75f1456c76df072c (diff) | |
upstream commit
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 'servconf.c')
| -rw-r--r-- | servconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.258 2015/01/13 07:39:19 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.259 2015/01/16 06:40:12 deraadt Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -28,6 +28,7 @@ #include <string.h> #include <signal.h> #include <unistd.h> +#include <limits.h> #include <stdarg.h> #include <errno.h> #ifdef HAVE_UTIL_H @@ -571,7 +572,7 @@ parse_token(const char *cp, const char *filename, char * derelativise_path(const char *path) { - char *expanded, *ret, cwd[MAXPATHLEN]; + char *expanded, *ret, cwd[PATH_MAX]; if (strcasecmp(path, "none") == 0) return xstrdup("none"); |