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 /ssh-agent.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 'ssh-agent.c')
| -rw-r--r-- | ssh-agent.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 24500d9d..ba8d020a 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.195 2015/01/14 19:33:41 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.196 2015/01/16 06:40:12 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -36,6 +36,7 @@ #include "includes.h" +#include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/param.h> #include <sys/resource.h> @@ -56,6 +57,7 @@ #include <errno.h> #include <fcntl.h> +#include <limits.h> #ifdef HAVE_PATHS_H # include <paths.h> #endif @@ -134,8 +136,8 @@ time_t parent_alive_interval = 0; pid_t cleanup_pid = 0; /* pathname and directory for AUTH_SOCKET */ -char socket_name[MAXPATHLEN]; -char socket_dir[MAXPATHLEN]; +char socket_name[PATH_MAX]; +char socket_dir[PATH_MAX]; /* locking */ int locked = 0; |