summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-07-09 04:01:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-07-09 04:01:31 +0000
commit8ddba513b51ae5177be3a8391f54aad04cbc1b32 (patch)
tree9dde85ba772a9417c6a50b9aabb5b10570551247 /usr.bin
parent2afba9ab3b6d4b3c8d01c5ede9c7f6c840faa3bc (diff)
remove more atalk bits
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/kdump/kdump.c16
-rw-r--r--usr.bin/netstat/netstat.15
2 files changed, 3 insertions, 18 deletions
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index d332e2dc48c..82d79aa1fc0 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdump.c,v 1.55 2011/07/08 19:29:44 otto Exp $ */
+/* $OpenBSD: kdump.c,v 1.56 2011/07/09 04:01:30 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -928,20 +928,6 @@ ktrsockaddr(struct sockaddr *sa)
printf("%s:%u", addr, ntohs(sa_in->sin_port));
break;
}
-#ifdef NETATALK
- case AF_APPLETALK: {
- struct sockaddr_at *sa_at;
- struct netrange *nr;
-
- sa_at = (struct sockaddr_at *)sa;
- check_sockaddr_len(at);
- nr = &sa_at->sat_range.r_netrange;
- printf("%d.%d, %d-%d, %d", ntohs(sa_at->sat_addr.s_net),
- sa_at->sat_addr.s_node, ntohs(nr->nr_firstnet),
- ntohs(nr->nr_lastnet), nr->nr_phase);
- break;
- }
-#endif
case AF_INET6: {
struct sockaddr_in6 *sa_in6;
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 3154be634a8..d5231cb94e6 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netstat.1,v 1.63 2011/03/15 13:10:31 jsing Exp $
+.\" $OpenBSD: netstat.1,v 1.64 2011/07/09 04:01:30 deraadt Exp $
.\" $NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
@@ -30,7 +30,7 @@
.\"
.\" from: @(#)netstat.1 8.8 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: March 15 2011 $
+.Dd $Mdocdate: July 9 2011 $
.Dt NETSTAT 1
.Os
.Sh NAME
@@ -157,7 +157,6 @@ The following address families are recognized:
.Pp
.Bl -column "Address Family" "AF_APPLETA" "Description" -offset indent -compact
.It Sy "Address Family" Ta Sy "Constant" Ta Sy "Description"
-.It "atalk" Ta Dv "AF_APPLETALK" Ta "AppleTalk"
.It "encap" Ta Dv "PF_KEY" Ta "IPsec"
.It "inet" Ta Dv "AF_INET" Ta "IP Version 4"
.It "inet6" Ta Dv "AF_INET6" Ta "IP Version 6"