diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-20 23:14:01 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-20 23:14:01 +0000 |
commit | 0d353a1c13d67f468d2050bfe32887d0ba303b7b (patch) | |
tree | 1e9c7e0084937d236545c12db03577bfdbea7cfc | |
parent | 253fef20e556beb97d859f46e51d80af53565ea3 (diff) |
Reduce use of <sys/param.h> and transition to <limits.h> throughout.
ok djm markus
31 files changed, 82 insertions, 81 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index e27944d0929..a5695301678 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.108 2014/12/21 22:27:56 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.109 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -25,7 +25,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/param.h> #include <errno.h> #include <fcntl.h> @@ -37,6 +36,7 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include "xmalloc.h" #include "match.h" @@ -285,7 +285,7 @@ auth_root_allowed(const char *method) char * expand_authorized_keys(const char *filename, struct passwd *pw) { - char *file, ret[MAXPATHLEN]; + char *file, ret[PATH_MAX]; int i; file = percent_expand(filename, "h", pw->pw_dir, @@ -377,7 +377,7 @@ int auth_secure_path(const char *name, struct stat *stp, const char *pw_dir, uid_t uid, char *err, size_t errlen) { - char buf[MAXPATHLEN], homedir[MAXPATHLEN]; + char buf[PATH_MAX], homedir[PATH_MAX]; char *cp; int comparehome = 0; struct stat st; diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index 4e0a67ae047..0771c32c17a 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.109 2015/01/08 10:14:08 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.110 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -26,7 +26,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/param.h> #include <sys/uio.h> #include <errno.h> @@ -35,6 +34,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include "cipher.h" #include "key.h" @@ -330,7 +330,7 @@ int sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp) { struct sshkey *pub = NULL; - char file[MAXPATHLEN]; + char file[PATH_MAX]; int r, fd; if (keyp != NULL) diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index b3b644d0333..77fa807ab54 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.339 2015/01/19 20:07:45 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.340 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 @@ -40,7 +40,7 @@ */ #include <sys/types.h> -#include <sys/param.h> +#include <sys/param.h> /* MIN MAX */ #include <sys/stat.h> #include <sys/ioctl.h> #include <sys/un.h> @@ -59,6 +59,7 @@ #include <string.h> #include <termios.h> #include <unistd.h> +#include <limits.h> #include <stdarg.h> #include "xmalloc.h" diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 0d5844cc21f..a045bd8ddd4 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.265 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: clientloop.c,v 1.266 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 @@ -60,12 +60,12 @@ */ +#include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/time.h> -#include <sys/param.h> #include <sys/queue.h> #include <ctype.h> @@ -78,6 +78,7 @@ #include <termios.h> #include <pwd.h> #include <unistd.h> +#include <limits.h> #include "xmalloc.h" #include "ssh.h" @@ -331,12 +332,12 @@ client_x11_get_proto(const char *display, const char *xauth_path, display = xdisplay; } if (trusted == 0) { - xauthdir = xmalloc(MAXPATHLEN); - xauthfile = xmalloc(MAXPATHLEN); - mktemp_proto(xauthdir, MAXPATHLEN); + xauthdir = xmalloc(PATH_MAX); + xauthfile = xmalloc(PATH_MAX); + mktemp_proto(xauthdir, PATH_MAX); if (mkdtemp(xauthdir) != NULL) { do_unlink = 1; - snprintf(xauthfile, MAXPATHLEN, "%s/xauthfile", + snprintf(xauthfile, PATH_MAX, "%s/xauthfile", xauthdir); snprintf(cmd, sizeof(cmd), "%s -f %s generate %s " SSH_X11_PROTO diff --git a/usr.bin/ssh/deattack.c b/usr.bin/ssh/deattack.c index db8f5aa7074..2cdbbff2cdb 100644 --- a/usr.bin/ssh/deattack.c +++ b/usr.bin/ssh/deattack.c @@ -1,4 +1,4 @@ -/* $OpenBSD: deattack.c,v 1.31 2015/01/19 19:52:16 markus Exp $ */ +/* $OpenBSD: deattack.c,v 1.32 2015/01/20 23:14:00 deraadt Exp $ */ /* * Cryptographic attack detector for ssh - source code * @@ -18,7 +18,6 @@ * <http://www.core-sdi.com> */ -#include <sys/param.h> #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c index b68eb857dc1..00d6cdc69f7 100644 --- a/usr.bin/ssh/dh.c +++ b/usr.bin/ssh/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.54 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: dh.c,v 1.55 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/param.h> /* MIN */ #include <openssl/bn.h> #include <openssl/dh.h> @@ -31,6 +31,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include "dh.h" #include "pathnames.h" diff --git a/usr.bin/ssh/groupaccess.c b/usr.bin/ssh/groupaccess.c index fd4a40ecee0..79da627aa9e 100644 --- a/usr.bin/ssh/groupaccess.c +++ b/usr.bin/ssh/groupaccess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: groupaccess.c,v 1.14 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: groupaccess.c,v 1.15 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001 Kevin Steves. All rights reserved. * @@ -24,13 +24,13 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <grp.h> #include <unistd.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include "xmalloc.h" #include "groupaccess.h" diff --git a/usr.bin/ssh/gss-genr.c b/usr.bin/ssh/gss-genr.c index 560cb15fe6c..def2a09da6a 100644 --- a/usr.bin/ssh/gss-genr.c +++ b/usr.bin/ssh/gss-genr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gss-genr.c,v 1.22 2013/11/08 00:39:15 djm Exp $ */ +/* $OpenBSD: gss-genr.c,v 1.23 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. @@ -30,6 +30,7 @@ #include <stdarg.h> #include <string.h> +#include <limits.h> #include "xmalloc.h" #include "buffer.h" diff --git a/usr.bin/ssh/gss-serv.c b/usr.bin/ssh/gss-serv.c index 930e2d2aa12..ffe41c8d6d0 100644 --- a/usr.bin/ssh/gss-serv.c +++ b/usr.bin/ssh/gss-serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gss-serv.c,v 1.27 2014/07/03 03:34:09 djm Exp $ */ +/* $OpenBSD: gss-serv.c,v 1.28 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -25,7 +25,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/queue.h> #ifdef GSSAPI diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c index b40a0e68b30..417896b2634 100644 --- a/usr.bin/ssh/kex.c +++ b/usr.bin/ssh/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.102 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: kex.c,v 1.103 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/param.h> /* MAX roundup */ #include <signal.h> #include <stdio.h> diff --git a/usr.bin/ssh/kexgexs.c b/usr.bin/ssh/kexgexs.c index 92a89d64f94..db835972729 100644 --- a/usr.bin/ssh/kexgexs.c +++ b/usr.bin/ssh/kexgexs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexs.c,v 1.22 2015/01/20 07:55:33 djm Exp $ */ +/* $OpenBSD: kexgexs.c,v 1.23 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/param.h> /* MIN MAX */ #include <stdio.h> #include <string.h> diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c index a2b9a97814c..ec477b83d0a 100644 --- a/usr.bin/ssh/key.c +++ b/usr.bin/ssh/key.c @@ -1,13 +1,13 @@ -/* $OpenBSD: key.c,v 1.125 2015/01/08 10:14:08 djm Exp $ */ +/* $OpenBSD: key.c,v 1.126 2015/01/20 23:14:00 deraadt Exp $ */ /* * placed in the public domain */ -#include <sys/param.h> #include <sys/types.h> #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <limits.h> #define SSH_KEY_NO_DEFINE #include "key.h" diff --git a/usr.bin/ssh/krl.c b/usr.bin/ssh/krl.c index c21c3bf3c3d..a7d146bd04d 100644 --- a/usr.bin/ssh/krl.c +++ b/usr.bin/ssh/krl.c @@ -14,10 +14,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.28 2015/01/19 17:35:48 djm Exp $ */ +/* $OpenBSD: krl.c,v 1.29 2015/01/20 23:14:00 deraadt Exp $ */ +#include <sys/param.h> /* MIN */ #include <sys/types.h> -#include <sys/param.h> #include <sys/tree.h> #include <sys/queue.h> diff --git a/usr.bin/ssh/moduli.c b/usr.bin/ssh/moduli.c index 2072afac8f1..245333de489 100644 --- a/usr.bin/ssh/moduli.c +++ b/usr.bin/ssh/moduli.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moduli.c,v 1.29 2014/08/21 01:08:52 doug Exp $ */ +/* $OpenBSD: moduli.c,v 1.30 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> @@ -37,7 +37,7 @@ * Second step: test primes' safety (processor intensive) */ -#include <sys/param.h> +#include <sys/param.h> /* MAX */ #include <sys/types.h> #include <openssl/bn.h> @@ -50,6 +50,7 @@ #include <stdarg.h> #include <time.h> #include <unistd.h> +#include <limits.h> #include "xmalloc.h" #include "dh.h" @@ -443,11 +444,11 @@ static void write_checkpoint(char *cpfile, u_int32_t lineno) { FILE *fp; - char tmp[MAXPATHLEN]; + char tmp[PATH_MAX]; int r; r = snprintf(tmp, sizeof(tmp), "%s.XXXXXXXXXX", cpfile); - if (r == -1 || r >= MAXPATHLEN) { + if (r == -1 || r >= PATH_MAX) { logit("write_checkpoint: temp pathname too long"); return; } diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 6f1755eb87e..e6d03a776c3 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.140 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: monitor.c,v 1.141 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -29,7 +29,6 @@ #include <sys/wait.h> #include <sys/socket.h> #include <sys/tree.h> -#include <sys/param.h> #include <sys/queue.h> #ifdef WITH_OPENSSL @@ -46,6 +45,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include "atomicio.h" #include "xmalloc.h" diff --git a/usr.bin/ssh/monitor_mm.c b/usr.bin/ssh/monitor_mm.c index f618023d7f0..7e80d1d7b22 100644 --- a/usr.bin/ssh/monitor_mm.c +++ b/usr.bin/ssh/monitor_mm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_mm.c,v 1.19 2014/01/04 17:50:55 tedu Exp $ */ +/* $OpenBSD: monitor_mm.c,v 1.20 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -27,13 +27,13 @@ #include <sys/types.h> #include <sys/mman.h> #include <sys/tree.h> -#include <sys/param.h> #include <errno.h> #include <stdarg.h> #include <stddef.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include "xmalloc.h" #include "ssh.h" diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 041b0650ca4..108270a07d2 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.49 2014/12/22 07:24:11 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.50 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -31,7 +31,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/queue.h> #include <sys/stat.h> #include <sys/socket.h> diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 9a86f776788..9b6544f0e13 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.202 2015/01/19 20:30:23 markus Exp $ */ +/* $OpenBSD: packet.c,v 1.203 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 @@ -37,12 +37,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/param.h> /* MIN roundup */ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/time.h> -#include <sys/param.h> - #include <netinet/in.h> #include <netinet/ip.h> @@ -52,6 +51,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include <signal.h> #include <time.h> diff --git a/usr.bin/ssh/sandbox-systrace.c b/usr.bin/ssh/sandbox-systrace.c index 6170f2e9b80..fc0e81d96d7 100644 --- a/usr.bin/ssh/sandbox-systrace.c +++ b/usr.bin/ssh/sandbox-systrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sandbox-systrace.c,v 1.13 2014/07/17 00:10:56 djm Exp $ */ +/* $OpenBSD: sandbox-systrace.c,v 1.14 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2011 Damien Miller <djm@mindrot.org> * @@ -16,7 +16,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/ioctl.h> #include <sys/syscall.h> #include <sys/socket.h> @@ -33,6 +32,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include "atomicio.h" #include "log.h" diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index bcf9bcb9d6b..d46459d4309 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.175 2015/01/19 20:16:15 markus Exp $ */ +/* $OpenBSD: serverloop.c,v 1.176 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 @@ -35,11 +35,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/wait.h> #include <sys/socket.h> #include <sys/time.h> -#include <sys/param.h> #include <sys/queue.h> #include <netinet/in.h> diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c index 739f58932fe..6efc7e90d84 100644 --- a/usr.bin/ssh/sftp-client.c +++ b/usr.bin/ssh/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.116 2015/01/14 13:54:13 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.117 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -20,12 +20,12 @@ /* XXX: remove all logging, only return status codes */ /* XXX: copy between two remote sites */ +#include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/poll.h> #include <sys/queue.h> #include <sys/stat.h> #include <sys/time.h> -#include <sys/param.h> #include <sys/statvfs.h> #include <sys/uio.h> diff --git a/usr.bin/ssh/sftp-common.c b/usr.bin/ssh/sftp-common.c index d51e632c235..29e1f6c19a2 100644 --- a/usr.bin/ssh/sftp-common.c +++ b/usr.bin/ssh/sftp-common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-common.c,v 1.27 2015/01/14 13:54:13 djm Exp $ */ +/* $OpenBSD: sftp-common.c,v 1.28 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Damien Miller. All rights reserved. @@ -24,9 +24,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/param.h> /* MAX */ #include <sys/types.h> #include <sys/stat.h> -#include <sys/param.h> #include <grp.h> #include <pwd.h> diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c index 08d19a9ffdb..2e7cdd340be 100644 --- a/usr.bin/ssh/sftp-server.c +++ b/usr.bin/ssh/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.104 2015/01/14 13:54:13 djm Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.105 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -15,10 +15,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> /* MIN */ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> -#include <sys/param.h> #include <sys/mount.h> #include <sys/statvfs.h> @@ -1031,7 +1031,7 @@ process_readdir(u_int32_t id) send_status(id, SSH2_FX_FAILURE); } else { struct stat st; - char pathname[MAXPATHLEN]; + char pathname[PATH_MAX]; Stat *stats; int nstats = 10, count = 0, i; @@ -1126,7 +1126,7 @@ process_rmdir(u_int32_t id) static void process_realpath(u_int32_t id) { - char resolvedname[MAXPATHLEN]; + char resolvedname[PATH_MAX]; char *path; int r; @@ -1207,7 +1207,7 @@ static void process_readlink(u_int32_t id) { int r, len; - char buf[MAXPATHLEN]; + char buf[PATH_MAX]; char *path; if ((r = sshbuf_get_cstring(iqueue, &path, NULL)) != 0) diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index e378f187009..d13d48d41bf 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.169 2015/01/14 13:54:13 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -15,12 +15,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> /* MIN MAX */ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/wait.h> #include <sys/stat.h> #include <sys/socket.h> -#include <sys/param.h> #include <sys/statvfs.h> #include <ctype.h> @@ -35,6 +35,7 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include <util.h> #include <stdarg.h> @@ -1380,7 +1381,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, int cmdnum, i; unsigned long n_arg = 0; Attrib a, *aa; - char path_buf[MAXPATHLEN]; + char path_buf[PATH_MAX]; int err = 0; glob_t g; diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 367f731c06f..80a757e601f 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.95 2015/01/19 20:32:39 markus Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.96 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -8,7 +8,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/socket.h> #include <sys/queue.h> #include <sys/time.h> diff --git a/usr.bin/ssh/ssh-pkcs11-helper.c b/usr.bin/ssh/ssh-pkcs11-helper.c index 5b5cd1b11c5..e80bca58384 100644 --- a/usr.bin/ssh/ssh-pkcs11-helper.c +++ b/usr.bin/ssh/ssh-pkcs11-helper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-helper.c,v 1.9 2014/12/11 08:20:09 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.10 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -16,7 +16,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/queue.h> #include <sys/time.h> diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index e17a49c76a8..108efd4bfa7 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 @@ -42,7 +42,6 @@ #include <sys/types.h> #include <sys/ioctl.h> -#include <sys/param.h> #include <sys/queue.h> #include <sys/resource.h> #include <sys/socket.h> @@ -62,6 +61,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #ifdef WITH_OPENSSL #include <openssl/evp.h> @@ -439,7 +439,7 @@ resolve_canonicalize(char **hostp, int port) 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) { @@ -490,7 +490,7 @@ int 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; diff --git a/usr.bin/ssh/sshbuf.c b/usr.bin/ssh/sshbuf.c index 0f23a71ede2..5bc729afa1d 100644 --- a/usr.bin/ssh/sshbuf.c +++ b/usr.bin/ssh/sshbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf.c,v 1.2 2014/06/25 14:16:09 deraadt Exp $ */ +/* $OpenBSD: sshbuf.c,v 1.3 2015/01/20 23:14:00 deraadt Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -15,8 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> /* roundup */ #include <sys/types.h> -#include <sys/param.h> #include <signal.h> #include <stdlib.h> #include <stdio.h> diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 725c01301c9..794e6286c5f 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.255 2015/01/19 20:20:20 markus Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.256 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 @@ -13,8 +13,8 @@ * called by a name other than "ssh" or "Secure Shell". */ +#include <sys/param.h> /* roundup */ #include <sys/types.h> -#include <sys/param.h> #include <sys/wait.h> #include <sys/stat.h> #include <sys/socket.h> diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index d318851411e..da6b133aff6 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.437 2015/01/20 20:16:21 markus Exp $ */ +/* $OpenBSD: sshd.c,v 1.438 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 @@ -43,7 +43,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/ioctl.h> #include <sys/wait.h> #include <sys/tree.h> @@ -62,6 +61,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #ifdef WITH_OPENSSL #include <openssl/bn.h> @@ -210,7 +210,7 @@ u_char *session_id2 = NULL; u_int session_id2_len = 0; /* record remote hostname or ip */ -u_int utmp_len = MAXHOSTNAMELEN; +u_int utmp_len = HOST_NAME_MAX+1; /* options.max_startup sized array of fd ints */ int *startup_pipes = NULL; @@ -1460,8 +1460,8 @@ main(int ac, char **av) exit(1); break; case 'u': - utmp_len = (u_int)strtonum(optarg, 0, MAXHOSTNAMELEN+1, NULL); - if (utmp_len > MAXHOSTNAMELEN) { + utmp_len = (u_int)strtonum(optarg, 0, HOST_NAME_MAX+1+1, NULL); + if (utmp_len > HOST_NAME_MAX+1) { fprintf(stderr, "Invalid utmp length.\n"); exit(1); } diff --git a/usr.bin/ssh/sshlogin.c b/usr.bin/ssh/sshlogin.c index e39b1147599..cd21b2e2c2a 100644 --- a/usr.bin/ssh/sshlogin.c +++ b/usr.bin/ssh/sshlogin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshlogin.c,v 1.30 2015/01/16 06:40:12 deraadt Exp $ */ +/* $OpenBSD: sshlogin.c,v 1.31 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 @@ -40,7 +40,6 @@ */ #include <sys/types.h> -#include <sys/param.h> /* MAXHOSTNAMELEN */ #include <sys/socket.h> #include <errno.h> @@ -52,6 +51,7 @@ #include <util.h> #include <utmp.h> #include <stdarg.h> +#include <limits.h> #include "sshlogin.h" #include "log.h" @@ -114,7 +114,7 @@ get_last_login_time(uid_t uid, const char *logname, static void store_lastlog_message(const char *user, uid_t uid) { - char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512]; + char *time_string, hostname[HOST_NAME_MAX+1] = "", buf[512]; time_t last_login_time; if (!options.print_lastlog) |