summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2014-10-24 10:18:49 +0000
committerschwarze <schwarze@openbsd.org>2014-10-24 10:18:49 +0000
commite1a7a702921124f5f86ef0e7e07acb5fa5a42197 (patch)
tree2df15b75639fe24964e5e6135fdf99f4d62d7340
parentnetinet/in_systm.h is not needed by the example program (diff)
downloadwireguard-openbsd-e1a7a702921124f5f86ef0e7e07acb5fa5a42197.tar.xz
wireguard-openbsd-e1a7a702921124f5f86ef0e7e07acb5fa5a42197.zip
This tool doesn't actually support networks(5).
So remove the call to setnetent(3) which is a no-op here (except for consuming a file descriptor) and the call sethostent(3) which is a no-op in general. Also remove the misleading reference to networks(5) from the manual. OK okan@ henning@
-rw-r--r--usr.bin/systat/netstat.c10
-rw-r--r--usr.bin/systat/systat.18
2 files changed, 4 insertions, 14 deletions
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 5ee94d3a701..ae8d9366ed5 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netstat.c,v 1.41 2014/10/08 04:10:04 doug Exp $ */
+/* $OpenBSD: netstat.c,v 1.42 2014/10/24 10:18:49 schwarze Exp $ */
/* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */
/*-
@@ -209,18 +209,10 @@ enter(struct inpcb *inp, struct socket *so, int state, char *proto)
int
select_ns(void)
{
- static int init = 0;
if (kd == NULL) {
num_disp = 1;
return (0);
}
-
- if (!init) {
- sethostent(1);
- setnetent(1);
- init = 1;
- }
-
num_disp = num_ns;
return (0);
}
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 1c4e16a42f3..82f91acd00c 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: systat.1,v 1.98 2014/08/14 08:10:30 mpi Exp $
+.\" $OpenBSD: systat.1,v 1.99 2014/10/24 10:18:50 schwarze Exp $
.\" $NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)systat.1 8.2 (Berkeley) 12/30/93
.\"
-.Dd $Mdocdate: August 14 2014 $
+.Dd $Mdocdate: October 24 2014 $
.Dt SYSTAT 1
.Os
.Sh NAME
@@ -592,11 +592,9 @@ number of kernel map entries
.\"Multiple drives may be specified, separated by spaces.
.\".El
.Sh FILES
-.Bl -tag -width "/etc/networksXXX" -compact
+.Bl -tag -width "/etc/servicesXXX" -compact
.It Pa /etc/hosts
Host names.
-.It Pa /etc/networks
-Network names.
.It Pa /etc/pf.conf
.Xr pf 4
configuration.