commit 087266ec33c76fc8d54ac5a19efacf2f4a4ca076
author deraadt@openbsd.org <deraadt@openbsd.org> Tue Jan 20 23:14:00 2015 +0000
committer Damien Miller <djm@mindrot.org> Mon Jan 26 23:58:53 2015 +1100
tree 71f57bb41b61561ebaa13026d8dc5d04d9829b00
parent 57e783c8ba2c0797f93977e83b2a8644a03065d8

upstream commit

Reduce use of <sys/param.h> and transition to <limits.h>
 throughout. ok djm markus

ssh.c

diff --git a/ssh.c b/ssh.c
index 5190f1f..430773c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.413 2015/01/16 07:19:48 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.414 2015/01/20 23:14:00 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -48,7 +48,6 @@
 #endif
 #include <sys/resource.h>
 #include <sys/ioctl.h>
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 
@@ -67,6 +66,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -454,7 +454,7 @@
 static void
 process_config_files(const char *host_arg, struct passwd *pw, int post_canon)
 {
-	char buf[MAXPATHLEN];
+	char buf[PATH_MAX];
 	int r;
 
 	if (config != NULL) {
@@ -505,7 +505,7 @@
 main(int ac, char **av)
 {
 	int i, r, opt, exit_status, use_syslog, config_test = 0;
-	char *p, *cp, *line, *argv0, buf[MAXPATHLEN], *host_arg, *logfile;
+	char *p, *cp, *line, *argv0, buf[PATH_MAX], *host_arg, *logfile;
 	char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];
 	char cname[NI_MAXHOST];
 	struct stat st;