Delete support for the networks.by{name,addr} YP maps.

This is part of the project to delete /etc/networks support.
OK deraadt@

5 files changed, 9 insertions, 43 deletions

diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 2af496605ce..4e5c771375c 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypbind.8,v 1.25 2017/02/17 16:46:17 ajacoutot Exp $
+.\"	$OpenBSD: ypbind.8,v 1.26 2018/04/26 12:53:09 schwarze Exp $
 .\"	$NetBSD: ypbind.8,v 1.2 1996/02/28 01:21:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 17 2017 $
+.Dd $Mdocdate: April 26 2018 $
 .Dt YPBIND 8
 .Os
 .Sh NAME
@@ -129,7 +129,6 @@ enable YP support for each of the following maps:
 .Xr ethers 5 ,
 .Xr group 5 ,
 .Xr hosts 5 ,
-.Xr networks 5 ,
 .Xr passwd 5 ,
 .Xr resolv.conf 5
 .Sh AUTHORS
diff --git a/usr.sbin/ypserv/ypinit/Makefile.main b/usr.sbin/ypserv/ypinit/Makefile.main
index f965ab3c3df..358d847da74 100644
--- a/usr.sbin/ypserv/ypinit/Makefile.main
+++ b/usr.sbin/ypserv/ypinit/Makefile.main
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.main,v 1.9 2002/07/19 02:38:40 deraadt Exp $
+#	$OpenBSD: Makefile.main,v 1.10 2018/04/26 12:53:09 schwarze Exp $
 
 SUBDIR=
 
-passwd group hosts ethers networks rpc services protocols netid netgroup amd.home aliases : _SUBDIRUSE
+passwd group hosts ethers rpc services protocols netid netgroup amd.home aliases : _SUBDIRUSE
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/ypserv/ypinit/Makefile.yp b/usr.sbin/ypserv/ypinit/Makefile.yp
index 5215ccb045b..755c1eaebf5 100644
--- a/usr.sbin/ypserv/ypinit/Makefile.yp
+++ b/usr.sbin/ypserv/ypinit/Makefile.yp
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.yp,v 1.17 2015/11/29 15:20:46 rpe Exp $
+#	$OpenBSD: Makefile.yp,v 1.18 2018/04/26 12:53:09 schwarze Exp $
 
 # ----------------------------------------------------------------------
 # User-configurable settings; see Makefile.yp(8) for details.
@@ -23,7 +23,7 @@ MAXGID=32765
 # Set this to -b to have ypserv ask DNS for unknown hosts.
 USEDNS=
 
-all: passwd group hosts ethers networks rpc services protocols netid netgroup amd.home aliases
+all: passwd group hosts ethers rpc services protocols netid netgroup amd.home aliases
 	pkill -HUP ypserv
 
 # ----------------------------------------------------------------------
@@ -175,26 +175,6 @@ ethers.time: $(DIR)/ethers
 		$(ECHO) "couldn't find $(>)"; \
 	fi
 
-networks.time: $(DIR)/networks
-	-@if [ -f $(>) ]; then \
-		$(SED) -e "/^#/d" -e s/#.*$$// $(>) | \
-		$(AWK) '{print $$1, $$0; for (i = 3;i <= NF;i++) print $$i,$$0}' | \
-		$(MAKEDBM) - networks.byname; \
-		$(AWK) 'BEGIN { OFS="\t"; } $$1 !~ /^#/ { print $$2, $$0 }' $(>) | \
-		$(MAKEDBM) - networks.byaddr; \
-		$(TOUCH) $(@); \
-		$(ECHO) "updated networks"; \
-		if [ ! $(NOPUSH) ]; then \
-			$(YPPUSH) -d $(DOMAIN) networks.byname; \
-			$(YPPUSH) -d $(DOMAIN) networks.byaddr; \
-			$(ECHO) "pushed networks"; \
-		else \
-			: ; \
-		fi \
-	else \
-		$(ECHO) "couldn't find $(>)"; \
-	fi
-
 rpc.time: $(DIR)/rpc
 	-@if [ -f $(>) ]; then \
 		$(AWK) 'BEGIN { OFS="\t"; } $$1 !~ /^#/ { print $$2, $$0 }' $(>) | \
@@ -341,7 +321,6 @@ passwd: passwd.time
 group: group.time
 hosts: hosts.time
 ethers: ethers.time
-networks: networks.time
 rpc: rpc.time
 services: services.time
 protocols: protocols.time
@@ -353,7 +332,6 @@ $(DIR)/passwd:
 $(DIR)/group:
 $(DIR)/hosts:
 $(DIR)/ethers:
-$(DIR)/networks:
 $(DIR)/rpc:
 $(DIR)/services:
 $(DIR)/protocols:
diff --git a/usr.sbin/ypserv/ypinit/Makefile.yp.8 b/usr.sbin/ypserv/ypinit/Makefile.yp.8
index afbb22d50d9..d1719643a50 100644
--- a/usr.sbin/ypserv/ypinit/Makefile.yp.8
+++ b/usr.sbin/ypserv/ypinit/Makefile.yp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: Makefile.yp.8,v 1.8 2015/11/30 17:03:05 jmc Exp $
+.\"	$OpenBSD: Makefile.yp.8,v 1.9 2018/04/26 12:53:09 schwarze Exp $
 .\"
 .\" Copyright (c) 2008 Ingo Schwarze <schwarze@usta.de>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 30 2015 $
+.Dd $Mdocdate: April 26 2018 $
 .Dt MAKEFILE.YP 8
 .Os
 .Sh NAME
@@ -202,15 +202,6 @@ maps from
 .Xr ethers 5
 for use by
 .Xr ethers 3 .
-.It Ic networks
-Generates the
-.Pa networks.byname
-and
-.Pa networks.byaddr
-maps from
-.Xr networks 5
-for use by
-.Xr getnetent 3 .
 .It Ic rpc
 Generates the
 .Pa rpc.bynumber
diff --git a/usr.sbin/ypserv/ypxfr/ypxfr_1perday.sh b/usr.sbin/ypserv/ypxfr/ypxfr_1perday.sh
index f1fc4ef51bb..9eb1ffe7b17 100644
--- a/usr.sbin/ypserv/ypxfr/ypxfr_1perday.sh
+++ b/usr.sbin/ypserv/ypxfr/ypxfr_1perday.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: ypxfr_1perday.sh,v 1.2 2002/07/19 02:38:40 deraadt Exp $
+#	$OpenBSD: ypxfr_1perday.sh,v 1.3 2018/04/26 12:53:09 schwarze Exp $
 #
 # ypxfr_1perday.sh - YP maps to be updated daily
 #
@@ -8,8 +8,6 @@
 /usr/sbin/ypxfr group.bygid
 /usr/sbin/ypxfr protocols.byname
 /usr/sbin/ypxfr protocols.bynumber
-/usr/sbin/ypxfr networks.byname
-/usr/sbin/ypxfr networks.byaddr
 /usr/sbin/ypxfr services.byname
 /usr/sbin/ypxfr rpc.bynumber
 /usr/sbin/ypxfr ypservers