summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2015-01-16 06:40:12 +0000
committerDamien Miller <djm@mindrot.org>2015-01-16 18:24:48 +1100
commit2ae4f337b2a5fb2841b6b0053b49496fef844d1c (patch)
tree59aac6ef59be3975eb3a1251abb0be330c008cdd /ssh-add.c
parent3c4726f4c24118e8f1bb80bf75f1456c76df072c (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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 32add8807..5ac51088f 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.116 2015/01/14 20:05:27 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.117 2015/01/16 06:40:12 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,7 +39,6 @@
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/stat.h> 41#include <sys/stat.h>
42#include <sys/param.h>
43 42
44#include <openssl/evp.h> 43#include <openssl/evp.h>
45#include "openbsd-compat/openssl-compat.h" 44#include "openbsd-compat/openssl-compat.h"
@@ -52,6 +51,7 @@
52#include <stdlib.h> 51#include <stdlib.h>
53#include <string.h> 52#include <string.h>
54#include <unistd.h> 53#include <unistd.h>
54#include <limits.h>
55 55
56#include "xmalloc.h" 56#include "xmalloc.h"
57#include "ssh.h" 57#include "ssh.h"
@@ -573,7 +573,7 @@ main(int argc, char **argv)
573 goto done; 573 goto done;
574 } 574 }
575 if (argc == 0) { 575 if (argc == 0) {
576 char buf[MAXPATHLEN]; 576 char buf[PATH_MAX];
577 struct passwd *pw; 577 struct passwd *pw;
578 struct stat st; 578 struct stat st;
579 int count = 0; 579 int count = 0;