diff options
| author | fvdl <fvdl@NetBSD.org> | 2000-06-02 22:54:08 +0000 |
|---|---|---|
| committer | fvdl <fvdl@NetBSD.org> | 2000-06-02 22:54:08 +0000 |
| commit | 02cd59a751362d2593ca1c5a39e45beb68b9cafc (patch) | |
| tree | 71744557152aa14fea14be46f1df2415227ed423 | |
| parent | 2a05365bbb5e42a915f852331586a8ea281ec0ca (diff) | |
* Portmap is now called rpcbind.
* Add IPv6 RPC entries to inetd.conf (commented out by default, as the others)
* Add netconfig file, needed for TI-RPC code.
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/inetd.conf | 8 | ||||
| -rw-r--r-- | etc/netconfig | 19 | ||||
| -rwxr-xr-x | etc/rc.d/Makefile | 4 | ||||
| -rwxr-xr-x | etc/rc.d/amd | 6 | ||||
| -rwxr-xr-x | etc/rc.d/bootparams | 4 | ||||
| -rwxr-xr-x | etc/rc.d/mountd | 4 | ||||
| -rwxr-xr-x | etc/rc.d/nfsd | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | etc/rc.d/rpcbind (renamed from etc/rc.d/portmap) | 8 | ||||
| -rwxr-xr-x | etc/rc.d/yppasswdd | 4 | ||||
| -rwxr-xr-x | etc/rc.d/ypserv | 6 | ||||
| -rw-r--r-- | etc/rpc | 4 | ||||
| -rw-r--r-- | etc/services | 6 |
13 files changed, 53 insertions, 28 deletions
diff --git a/etc/Makefile b/etc/Makefile index ca8a8fdcaf6..c122e372094 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2000/05/13 08:07:01 lukem Exp $ +# $NetBSD: Makefile,v 1.151 2000/06/02 22:54:08 fvdl Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -84,7 +84,7 @@ BIN1+= bootptab changelist csh.cshrc csh.login csh.logout daily \ daily.conf dm.conf floppytab ftpchroot ftpusers ftpwelcome \ gettytab group hosts hosts.lpd inetd.conf lkm.conf \ mailer.conf man.conf monthly monthly.conf mrouted.conf \ - networks newsyslog.conf nsswitch.conf ntp.conf \ + netconfig networks newsyslog.conf nsswitch.conf ntp.conf \ phones printcap profile protocols rbootd.conf rc rc.conf \ rc.lkm rc.local rc.subr rc.shutdown rc.wscons remote rpc \ security security.conf services shells sysctl.conf syslog.conf \ diff --git a/etc/inetd.conf b/etc/inetd.conf index e2541572178..99841ae523e 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -1,4 +1,4 @@ -# $NetBSD: inetd.conf,v 1.33 2000/05/13 07:28:09 lukem Exp $ +# $NetBSD: inetd.conf,v 1.34 2000/06/02 22:54:09 fvdl Exp $ # # Internet server configuration database # @@ -67,3 +67,9 @@ telnet stream tcp6 nowait root /usr/libexec/telnetd telnetd #login stream tcp6 nowait root /usr/libexec/rlogind rlogind #finger stream tcp6 nowait nobody /usr/libexec/fingerd fingerd #tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -s /tftpboot + +# +# IPv6 RPC services. +# +#rstatd/1-3 dgram rpc/udp6 wait root /usr/libexec/rpc.rstatd rpc.rstatd +#rusersd/2-3 dgram rpc/udp6 wait root /usr/libexec/rpc.rusersd rpc.rusersd diff --git a/etc/netconfig b/etc/netconfig new file mode 100644 index 00000000000..800793ed6ac --- /dev/null +++ b/etc/netconfig @@ -0,0 +1,19 @@ +# $NetBSD: netconfig,v 1.1 2000/06/02 22:54:10 fvdl Exp $ +# +# 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 NetBSD. +# +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 - - - diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 6ac3a1cebf4..77f9d1a8b44 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2000/05/03 14:40:39 joda Exp $ +# $NetBSD: Makefile,v 1.6 2000/06/02 22:54:11 fvdl Exp $ FILES= DAEMON LOGIN SERVERS accounting amd apmd bootparams bootconf.sh ccd \ cleartmp cron dhclient dhcpd dhcrelay dmesg fsck.sh gated inetd \ ipfilter ipmon ipnat kerberos ldconfig lkm1 lkm2 lkm3 local lpd mopd \ motd mountall mountcritlocal mountcritremote mountd mrouted named \ - network nfsd nfslocking ntpd ntpdate portmap postfix ppp pwcheck quota \ + network nfsd nfslocking ntpd ntpdate rpcbind postfix ppp pwcheck quota \ raidframe rarpd rbootd root route6d routed rtadvd rtsold rwho savecore \ screenblank sendmail swap1 swap2 sysdb sysctl syslogd systemfs timed \ ttys virecover wscons xdm xfs ypbind yppasswdd ypserv diff --git a/etc/rc.d/amd b/etc/rc.d/amd index ce839dada5e..1d8429035aa 100755 --- a/etc/rc.d/amd +++ b/etc/rc.d/amd @@ -1,10 +1,10 @@ #!/bin/sh # -# $NetBSD: amd,v 1.4 2000/05/29 06:53:03 tron Exp $ +# $NetBSD: amd,v 1.5 2000/06/02 22:54:11 fvdl Exp $ # # PROVIDE: amd -# REQUIRE: portmap mountall ypbind +# REQUIRE: rpcbind mountall ypbind . /etc/rc.subr @@ -15,6 +15,6 @@ load_rc_config $name command_args='-p -a '$amd_dir' `sed s/#.*$// <'$amd_master'` >/var/run/amd.pid' required_files="$amd_master" required_dirs="$amd_dir" -required_vars="portmap" +required_vars="rpcbind" run_rc_command "$1" diff --git a/etc/rc.d/bootparams b/etc/rc.d/bootparams index 0931bbcb1ab..0faad0bd180 100755 --- a/etc/rc.d/bootparams +++ b/etc/rc.d/bootparams @@ -1,10 +1,10 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.3 2000/05/13 08:45:06 lukem Exp $ +# $NetBSD: bootparams,v 1.4 2000/06/02 22:54:11 fvdl Exp $ # # PROVIDE: bootparams -# REQUIRE: portmap DAEMON +# REQUIRE: rpcbind DAEMON . /etc/rc.subr diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd index 52e69306e22..40a43bec87c 100755 --- a/etc/rc.d/mountd +++ b/etc/rc.d/mountd @@ -1,10 +1,10 @@ #!/bin/sh # -# $NetBSD: mountd,v 1.5 2000/05/29 07:10:41 bouyer Exp $ +# $NetBSD: mountd,v 1.6 2000/06/02 22:54:11 fvdl Exp $ # # PROVIDE: mountd -# REQUIRE: mountall beforemountlkm network portmap quota +# REQUIRE: mountall beforemountlkm network rpcbind quota . /etc/rc.subr diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd index 53257d141cb..2ec38fe9c68 100755 --- a/etc/rc.d/nfsd +++ b/etc/rc.d/nfsd @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: nfsd,v 1.2 2000/05/13 08:45:07 lukem Exp $ +# $NetBSD: nfsd,v 1.3 2000/06/02 22:54:12 fvdl Exp $ # # PROVIDE: nfsd @@ -11,7 +11,7 @@ name="nfsd" rcvar="nfs_server" command="/usr/sbin/${name}" -required_vars="portmap" +required_vars="rpcbind" load_rc_config $name run_rc_command "$1" diff --git a/etc/rc.d/portmap b/etc/rc.d/rpcbind index bf21c865b26..c8387f7a364 100644..100755 --- a/etc/rc.d/portmap +++ b/etc/rc.d/rpcbind @@ -1,15 +1,15 @@ #!/bin/sh # -# $NetBSD: portmap,v 1.2 2000/05/13 08:45:08 lukem Exp $ +# $NetBSD: rpcbind,v 1.1 2000/06/02 22:54:12 fvdl Exp $ # -# PROVIDE: portmap +# PROVIDE: rpcbind # REQUIRE: network ntpdate syslogd named ppp . /etc/rc.subr +. /etc/rc.conf -name="portmap" +name="rpcbind" command="/usr/sbin/${name}" -load_rc_config $name run_rc_command "$1" diff --git a/etc/rc.d/yppasswdd b/etc/rc.d/yppasswdd index c26146afa8c..b50126aa1c6 100755 --- a/etc/rc.d/yppasswdd +++ b/etc/rc.d/yppasswdd @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: yppasswdd,v 1.3 2000/05/13 08:45:10 lukem Exp $ +# $NetBSD: yppasswdd,v 1.4 2000/06/02 22:54:13 fvdl Exp $ # # PROVIDE: yppasswdd @@ -10,7 +10,7 @@ name="yppasswdd" command="/usr/sbin/rpc.${name}" -required_vars="portmap ypserv" +required_vars="rpcbind ypserv" start_precmd="yppasswdd_precmd" yppasswdd_precmd() diff --git a/etc/rc.d/ypserv b/etc/rc.d/ypserv index c3ed3d59e81..a3099c3cf5e 100755 --- a/etc/rc.d/ypserv +++ b/etc/rc.d/ypserv @@ -1,16 +1,16 @@ #!/bin/sh # -# $NetBSD: ypserv,v 1.3 2000/05/13 08:45:10 lukem Exp $ +# $NetBSD: ypserv,v 1.4 2000/06/02 22:54:13 fvdl Exp $ # # PROVIDE: ypserv -# REQUIRE: portmap +# REQUIRE: rpcbind . /etc/rc.subr name="ypserv" command="/usr/sbin/${name}" -required_vars="portmap" +required_vars="rpcbind" start_precmd="ypserv_precmd" ypserv_precmd() @@ -1,8 +1,8 @@ -# $NetBSD: rpc,v 1.5 1996/05/08 17:19:47 thorpej Exp $ +# $NetBSD: rpc,v 1.6 2000/06/02 22:54:10 fvdl Exp $ # # rpc 88/08/01 4.0 RPCSRC; from 1.12 88/02/07 SMI # -portmapper 100000 portmap sunrpc +portmapper 100000 portmap sunrpc rpcbind rstatd 100001 rstat rstat_svc rup perfmeter rusersd 100002 rusers nfs 100003 nfsprog diff --git a/etc/services b/etc/services index 46402a61c45..1754756597c 100644 --- a/etc/services +++ b/etc/services @@ -1,4 +1,4 @@ -# $NetBSD: services,v 1.34 2000/04/26 16:28:17 tron Exp $ +# $NetBSD: services,v 1.35 2000/06/02 22:54:10 fvdl Exp $ # # Network services, Internet style # @@ -66,8 +66,8 @@ pop2 109/tcp postoffice # POP version 2 pop2 109/udp pop3 110/tcp # POP version 3 pop3 110/udp -sunrpc 111/tcp # Remote Procedure Call -sunrpc 111/udp +sunrpc 111/tcp rpcbind # Remote Procedure Call +sunrpc 111/udp rpcbind auth 113/tcp authentication tap ident sftp 115/tcp uucp-path 117/tcp |
