svn commit: r338732 - in head: etc lib/libc/rpc

[Brad Davis]

Author: brd
Date: Mon Sep 17 19:20:50 2018
New Revision: 338732
URL: https://svnweb.freebsd.org/changeset/base/338732

Log:
  Move rpc and netconfig to lib/libc/rpc/
  
  This uses relative paths to make it more specific to avoid any potential
  future problems with .PATH and leverages CONFS.
  
  libc was picked as the destination location for these because of the syscalls
  that use these files as the lowest level place they are referenced.
  
  Approved by:	re (gjb), will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17163

Added:
  head/lib/libc/rpc/netconfig
     - copied unchanged from r338731, head/etc/netconfig
  head/lib/libc/rpc/rpc
     - copied unchanged from r338731, head/etc/rpc
Deleted:
  head/etc/netconfig
  head/etc/rpc
Modified:
  head/etc/Makefile
  head/lib/libc/rpc/Makefile.inc

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Mon Sep 17 19:05:32 2018	(r338731)
+++ head/etc/Makefile	Mon Sep 17 19:20:50 2018	(r338732)
@@ -21,12 +21,10 @@ BIN1=	\
 	libmap.conf \
 	login.access \
 	mac.conf \
-	netconfig \
 	phones \
 	rc.bsdextended \
 	rc.firewall \
 	remote \
-	rpc \
 	termcap.small
 
 # NB: keep these sorted by MK_* knobs

Modified: head/lib/libc/rpc/Makefile.inc
==============================================================================
--- head/lib/libc/rpc/Makefile.inc	Mon Sep 17 19:05:32 2018	(r338731)
+++ head/lib/libc/rpc/Makefile.inc	Mon Sep 17 19:20:50 2018	(r338732)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 .PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/.
+CONFS=	rpc/netconfig rpc/rpc
 SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
 	clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
 	clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \

Copied: head/lib/libc/rpc/netconfig (from r338731, head/etc/netconfig)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libc/rpc/netconfig	Mon Sep 17 19:20:50 2018	(r338732, copy of r338731, head/etc/netconfig)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+#
+# The network configuration file. This file is currently only used in
+# conjunction with the (TI-) RPC code in the C library, unlike its
+# use in SVR4.
+#
+# Entries consist of:
+#
+#       <network_id> <semantics> <flags> <protofamily> <protoname> \
+#               <device> <nametoaddr_libs>
+#
+# The <device> and <nametoaddr_libs> fields are always empty in FreeBSD.
+#
+udp6       tpi_clts      v     inet6    udp     -       -
+tcp6       tpi_cots_ord  v     inet6    tcp     -       -
+udp        tpi_clts      v     inet     udp     -       -
+tcp        tpi_cots_ord  v     inet     tcp     -       -
+rawip      tpi_raw       -     inet      -      -       -
+local      tpi_cots_ord  -     loopback  -      -       -

Copied: head/lib/libc/rpc/rpc (from r338731, head/etc/rpc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libc/rpc/rpc	Mon Sep 17 19:20:50 2018	(r338732, copy of r338731, head/etc/rpc)
@@ -0,0 +1,68 @@
+#
+# $FreeBSD$
+# rpc 88/08/01 4.0 RPCSRC; from 1.12   99/07/25 SMI
+#
+rpcbind		100000  portmap sunrpc rpcbind
+rstatd		100001	rstat rstat_svc rup perfmeter
+rusersd		100002	rusers
+nfs		100003	nfsprog
+ypserv		100004	ypprog
+mountd		100005	mount showmount
+ypbind		100007
+walld		100008	rwall shutdown
+yppasswdd	100009	yppasswd
+etherstatd	100010	etherstat
+rquotad		100011	rquotaprog quota rquota
+sprayd		100012	spray
+3270_mapper	100013
+rje_mapper	100014
+selection_svc	100015	selnsvc
+database_svc	100016
+rexd		100017	rex
+alis		100018
+sched		100019
+llockmgr	100020
+nlockmgr	100021
+x25.inr		100022
+statmon		100023
+status		100024
+bootparamd	100026	bootparam
+ypupdated	100028	ypupdate
+keyserv		100029	keyserver
+sunlink_mapper	100033
+tfsd		100037
+nsed		100038
+nsemntd		100039
+showfhd		100043	showfh
+ioadmd		100055	rpc.ioadmd
+NETlicense	100062
+sunisamd	100065
+debug_svc	100066	dbsrv
+cmsd		100068
+bugtraqd	100071
+kerbd		100078
+ttdbserver	100083	tooltalk
+event		100101	na.event        # SunNet Manager
+logger		100102	na.logger       # SunNet Manager
+sync		100104	na.sync
+hostperf	100107	na.hostperf
+activity	100109	na.activity     # SunNet Manager
+hostmem		100112	na.hostmem
+sample		100113	na.sample
+x25		100114	na.x25
+ping		100115	na.ping
+rpcnfs		100116	na.rpcnfs
+hostif		100117	na.hostif
+etherif		100118	na.etherif
+iproutes	100120	na.iproutes
+layers		100121	na.layers
+snmp		100122	na.snmp snmp-cmc snmp-synoptics snmp-unisys snmp-utk
+traffic		100123	na.traffic
+nfs_acl		100227
+sadmind		100232
+nisd		100300	rpc.nisd
+nispasswd	100303	rpc.nispasswdd
+ufsd		100233
+pcnfsd		150001	pcnfs
+amd		300019
+sgi_fam		391002		# file alteration monitor