diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
| commit | b9fc9a728fce9c4289b7e9a992665e28d5629a54 (patch) | |
| tree | 72b2433e418dfa1aef5fcf8305617b97979a25d8 /usr.bin/netstat/inet6.c | |
| parent | improve checksum parsing slightly. now handles filenames with spaces. (diff) | |
| download | wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.tar.xz wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.zip | |
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 'usr.bin/netstat/inet6.c')
| -rw-r--r-- | usr.bin/netstat/inet6.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c index a321ae369cc..124e28cd57a 100644 --- a/usr.bin/netstat/inet6.c +++ b/usr.bin/netstat/inet6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet6.c,v 1.46 2014/08/14 12:55:50 mpi Exp $ */ +/* $OpenBSD: inet6.c,v 1.47 2015/01/16 06:40:10 deraadt Exp $ */ /* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */ /* * Copyright (c) 1983, 1988, 1993 @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/ioctl.h> @@ -60,6 +60,7 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include "netstat.h" struct socket sockb; @@ -1113,7 +1114,7 @@ inet6name(struct in6_addr *in6p) char *cp; static char line[NI_MAXHOST]; struct hostent *hp; - static char domain[MAXHOSTNAMELEN]; + static char domain[HOST_NAME_MAX+1]; static int first = 1; char hbuf[NI_MAXHOST]; struct sockaddr_in6 sin6; |