diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-01-20 23:14:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-26 23:58:53 +1100 |
commit | 087266ec33c76fc8d54ac5a19efacf2f4a4ca076 (patch) | |
tree | 71f57bb41b61561ebaa13026d8dc5d04d9829b00 /ssh.c | |
parent | 57e783c8ba2c0797f93977e83b2a8644a03065d8 (diff) |
upstream commit
Reduce use of <sys/param.h> and transition to <limits.h>
throughout. ok djm markus
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.413 2015/01/16 07:19:48 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.414 2015/01/20 23:14:00 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 |
@@ -48,7 +48,6 @@ | |||
48 | #endif | 48 | #endif |
49 | #include <sys/resource.h> | 49 | #include <sys/resource.h> |
50 | #include <sys/ioctl.h> | 50 | #include <sys/ioctl.h> |
51 | #include <sys/param.h> | ||
52 | #include <sys/socket.h> | 51 | #include <sys/socket.h> |
53 | #include <sys/wait.h> | 52 | #include <sys/wait.h> |
54 | 53 | ||
@@ -67,6 +66,7 @@ | |||
67 | #include <stdlib.h> | 66 | #include <stdlib.h> |
68 | #include <string.h> | 67 | #include <string.h> |
69 | #include <unistd.h> | 68 | #include <unistd.h> |
69 | #include <limits.h> | ||
70 | 70 | ||
71 | #include <netinet/in.h> | 71 | #include <netinet/in.h> |
72 | #include <arpa/inet.h> | 72 | #include <arpa/inet.h> |
@@ -454,7 +454,7 @@ resolve_canonicalize(char **hostp, int port) | |||
454 | static void | 454 | static void |
455 | process_config_files(const char *host_arg, struct passwd *pw, int post_canon) | 455 | process_config_files(const char *host_arg, struct passwd *pw, int post_canon) |
456 | { | 456 | { |
457 | char buf[MAXPATHLEN]; | 457 | char buf[PATH_MAX]; |
458 | int r; | 458 | int r; |
459 | 459 | ||
460 | if (config != NULL) { | 460 | if (config != NULL) { |
@@ -505,7 +505,7 @@ int | |||
505 | main(int ac, char **av) | 505 | main(int ac, char **av) |
506 | { | 506 | { |
507 | int i, r, opt, exit_status, use_syslog, config_test = 0; | 507 | int i, r, opt, exit_status, use_syslog, config_test = 0; |
508 | char *p, *cp, *line, *argv0, buf[MAXPATHLEN], *host_arg, *logfile; | 508 | char *p, *cp, *line, *argv0, buf[PATH_MAX], *host_arg, *logfile; |
509 | char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV]; | 509 | char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV]; |
510 | char cname[NI_MAXHOST]; | 510 | char cname[NI_MAXHOST]; |
511 | struct stat st; | 511 | struct stat st; |