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-add.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-add.c')
| -rw-r--r-- | ssh-add.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.116 2015/01/14 20:05:27 djm Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.117 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 @@ -39,7 +39,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/param.h> #include <openssl/evp.h> #include "openbsd-compat/openssl-compat.h" @@ -52,6 +51,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include "xmalloc.h" #include "ssh.h" @@ -573,7 +573,7 @@ main(int argc, char **argv) goto done; } if (argc == 0) { - char buf[MAXPATHLEN]; + char buf[PATH_MAX]; struct passwd *pw; struct stat st; int count = 0; |