Bring in a hybrid of SunSoft's transport-independent RPC (TI-RPC) and

associated changes that had to happen to make this possible as well as
bugs fixed along the way.

  Bring in required TLI library routines to support this.

  Since we don't support TLI we've essentially copied what NetBSD
  has done, adding a thin layer to emulate direct the TLI calls
  into BSD socket calls.

  This is mostly from Sun's tirpc release that was made in 1994,
  however some fixes were backported from the 1999 release (supposedly
  only made available after this porting effort was underway).

  The submitter has agreed to continue on and bring us up to the
  1999 release.

  Several key features are introduced with this update:
    Client calls are thread safe. (1999 code has server side thread
    safe)
    Updated, a more modern interface.

  Many userland updates were done to bring the code up to par with
  the recent RPC API.

  There is an update to the pthreads library, a function
  pthread_main_np() was added to emulate a function of Sun's threads
  library.

  While we're at it, bring in NetBSD's lockd, it's been far too
  long of a wait.

  New rpcbind(8) replaces portmap(8) (supporting communication over
  an authenticated Unix-domain socket, and by default only allowing
  set and unset requests over that channel). It's much more secure
  than the old portmapper.

  Umount(8), mountd(8), mount_nfs(8), nfsd(8) have also been upgraded
  to support TI-RPC and to support IPV6.

  Umount(8) is also fixed to unmount pathnames longer than 80 chars,
  which are currently truncated by the Kernel statfs structure.

Submitted by: Martin Blapp <mb@imp.ch>
Manpage review: ru
Secure RPC implemented by: wpaul

11 files changed, 894 insertions, 804 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 14814f5..acc18d1 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -10,7 +10,7 @@ BIN1=   amd.map apmd.conf auth.conf \
 	dhclient.conf dm.conf fbtab ftpusers gettytab group \
 	hosts hosts.allow hosts.equiv hosts.lpd \
 	inetd.conf login.access login.conf \
-	motd modems networks newsyslog.conf \
+	motd modems netconfig networks newsyslog.conf \
 	pam.conf phones pim6dd.conf pim6sd.conf \
 	printcap profile protocols \
 	rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 3865a43..d05dc77 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -101,7 +101,7 @@ ppp_nat="YES"		# Use PPP's internal network address translation or NO.
 ppp_profile="papchap"	# Which profile to use from /etc/ppp/ppp.conf.
 ppp_user="root"		# Which user to run ppp as
 
-### Network daemon (miscellaneous) & NFS options: ###
+### Network daemon (miscellaneous) ###
 syslogd_enable="YES"		# Run syslog daemon (or NO).
 syslogd_flags="-s"		# Flags to syslogd (if enabled).
 inetd_enable="NO"		# Run the network daemon dispatcher (YES/NO).
@@ -121,6 +121,19 @@ kadmind_server_enable="NO"	# Run kadmind (or NO) -- do not run on
 kerberos_stash=""		# Is the kerberos master key stashed?
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod
+rarpd_enable="NO"		# Run rarpd (or NO).
+rarpd_flags=""			# Flags to rarpd.
+xtend_enable="NO"		# Run the X-10 power controller daemon.
+xtend_flags=""			# Flags to xtend (if enabled).
+pppoed_enable="NO"		# Run the PPP over Ethernet daemon.
+pppoed_provider="*"		# Provider and ppp(8) config file entry.
+pppoed_flags="-P /var/run/pppoed.pid"	# Flags to pppoed (if enabled).
+pppoed_interface="fxp0"		# The interface that pppoed runs on.
+sshd_enable="NO"                # Enable sshd
+sshd_program="/usr/sbin/sshd"	# path to sshd, if you want a different one.
+sshd_flags=""                   # Additional flags for sshd.
+
+### Network daemon (NFS) Need all portmap_enable="YES" ###
 amd_enable="NO"			# Run amd service with $amd_flags (or NO).
 amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
 amd_map_program="NO"		# Can be set to "ypcat -k amd.master"
@@ -135,24 +148,13 @@ weak_mountd_authentication="NO"	# Allow non-root mount requests to be served.
 nfs_reserved_port_only="NO"	# Provide NFS only on secure port (or NO).
 nfs_bufpackets="DEFAULT"	# bufspace (in packets) for client (or DEFAULT)
 rpc_lockd_enable="NO"		# Run NFS rpc.lockd (*broken!*) if nfs_server.
-rpc_statd_enable="YES"		# Run NFS rpc.statd if nfs_server (or NO).
+rpc_statd_enable="NO"		# Run NFS rpc.statd if nfs_server (or NO).
 portmap_enable="NO"		# Run the portmapper service (YES/NO).
-portmap_program="/usr/sbin/portmap"	# path to portmap, if you want a different one.
+portmap_program="/usr/sbin/rpcbind"	# path to portmap, if you want a different one.
 portmap_flags=""		# Flags to portmap (if enabled).
 rpc_ypupdated_enable="NO"	# Run if NIS master and SecureRPC (or NO).
 keyserv_enable="NO"		# Run the SecureRPC keyserver (or NO).
 keyserv_flags=""		# Flags to keyserv (if enabled).
-rarpd_enable="NO"		# Run rarpd (or NO).
-rarpd_flags=""			# Flags to rarpd.
-xtend_enable="NO"		# Run the X-10 power controller daemon.
-xtend_flags=""			# Flags to xtend (if enabled).
-pppoed_enable="NO"		# Run the PPP over Ethernet daemon.
-pppoed_provider="*"		# Provider and ppp(8) config file entry.
-pppoed_flags="-P /var/run/pppoed.pid"	# Flags to pppoed (if enabled).
-pppoed_interface="fxp0"		# The interface that pppoed runs on.
-sshd_enable="NO"                # Enable sshd
-sshd_program="/usr/sbin/sshd"	# path to sshd, if you want a different one.
-sshd_flags=""                   # Additional flags for sshd.
 
 ### Network Time Services options: ###
 timed_enable="NO"		# Run the time daemon (or NO).
@@ -164,7 +166,7 @@ xntpd_enable="NO"		# Run ntpd Network Time Protocol (or NO).
 xntpd_program="ntpd"		# path to ntpd, if you want a different one.
 xntpd_flags="-p /var/run/ntpd.pid"	# Flags to ntpd (if enabled).
 
-# Network Information Services (NIS) options: ###
+# Network Information Services (NIS) options: Need all portmap_enable="YES" ###
 nis_client_enable="NO"		# We're an NIS client (or NO).
 nis_client_flags=""		# Flags to ypbind (if enabled).
 nis_ypset_enable="NO"		# Run ypset at boot time (or NO).
diff --git a/etc/netconfig b/etc/netconfig
new file mode 100644
index 0000000..89234fe
--- /dev/null
+++ b/etc/netconfig
@@ -0,0 +1,17 @@
+# 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      -      -       -
+unix       tpi_cots_ord  -     loopback  -      -       -
diff --git a/etc/network.subr b/etc/network.subr
index ef6c603..c1ffb37 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index ef6c603..c1ffb37 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index ef6c603..c1ffb37 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index ef6c603..c1ffb37 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index ef6c603..c1ffb37 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index ef6c603..c1ffb37 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rc.network b/etc/rc.network
index ef6c603..c1ffb37 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -514,59 +514,61 @@ network_pass2() {
 
 	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' portmap';	${portmap_program:-/usr/sbin/portmap} ${portmap_flags}
-		;;
-	esac
+		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
+			${portmap_flags}
 
-	# Start ypserv if we're an NIS server.
-	# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
-	#
-	case ${nis_server_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypserv'; ypserv ${nis_server_flags}
-
-		case ${nis_ypxfrd_enable} in
+		# Start ypserv if we're an NIS server.
+		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
+		#
+		case ${nis_server_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.ypxfrd'
-			rpc.ypxfrd ${nis_ypxfrd_flags}
+			echo -n ' ypserv'; ypserv ${nis_server_flags}
+
+			case ${nis_ypxfrd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.ypxfrd'
+				rpc.ypxfrd ${nis_ypxfrd_flags}
+				;;
+			esac
+
+			case ${nis_yppasswdd_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' rpc.yppasswdd'
+				rpc.yppasswdd ${nis_yppasswdd_flags}
+				;;
+			esac
 			;;
 		esac
 
-		case ${nis_yppasswdd_enable} in
+		# Start ypbind if we're an NIS client
+		#
+		case ${nis_client_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' rpc.yppasswdd'
-			rpc.yppasswdd ${nis_yppasswdd_flags}
+			echo -n ' ypbind'; ypbind ${nis_client_flags}
+			case ${nis_ypset_enable} in
+			[Yy][Ee][Ss])
+				echo -n ' ypset';	ypset ${nis_ypset_flags}
+				;;
+			esac
 			;;
 		esac
-		;;
-	esac
 
-	# Start ypbind if we're an NIS client
-	#
-	case ${nis_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' ypbind'; ypbind ${nis_client_flags}
-		case ${nis_ypset_enable} in
+		# Start keyserv if we are running Secure RPC
+		#
+		case ${keyserv_enable} in
 		[Yy][Ee][Ss])
-			echo -n ' ypset';	ypset ${nis_ypset_flags}
+			echo -n ' keyserv';	keyserv ${keyserv_flags}
 			;;
 		esac
-		;;
-	esac
 
-	# Start keyserv if we are running Secure RPC
-	#
-	case ${keyserv_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' keyserv';	keyserv ${keyserv_flags}
-		;;
-	esac
-
-	# Start ypupdated if we are running Secure RPC and we are NIS master
-	#
-	case ${rpc_ypupdated_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' rpc.ypupdated';	rpc.ypupdated
+		# Start ypupdated if we are running Secure RPC
+		# and we are NIS master
+		#
+		case ${rpc_ypupdated_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' rpc.ypupdated';	rpc.ypupdated
+			;;
+		esac
 		;;
 	esac
 
@@ -582,99 +584,103 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${nfs_server_enable} in
+	case ${portmap_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/exports ]; then
-			echo -n ' mountd'
-
-			case ${weak_mountd_authentication} in
-			[Yy][Ee][Ss])
-				mountd_flags="${mountd_flags} -n"
-				;;
-			esac
+		case ${nfs_server_enable} in
+		[Yy][Ee][Ss])
+			if [ -r /etc/exports ]; then
+				echo -n ' mountd'
 
-			mountd ${mountd_flags}
+				case ${weak_mountd_authentication} in
+				[Yy][Ee][Ss])
+					mountd_flags="${mountd_flags} -n"
+					;;
+				esac
 
-			case ${nfs_reserved_port_only} in
-			[Yy][Ee][Ss])
-				echo -n ' NFS on reserved port only=YES'
-				sysctl -w vfs.nfs.nfs_privport=1 >/dev/null
-				;;
-			esac
+				mountd ${mountd_flags}
 
-			echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				case ${nfs_reserved_port_only} in
+				[Yy][Ee][Ss])
+					echo -n ' NFS on reserved port only=YES'
+					sysctl -w vfs.nfs.nfs_privport=1 > /dev/null
+					;;
+				esac
 
-			if [ -n "${nfs_bufpackets}" ]; then
-				sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} \
-					> /dev/null
-			fi
+				echo -n ' nfsd';	nfsd ${nfs_server_flags}
 
-			case ${rpc_lockd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.lockd';	rpc.lockd
-				;;
-			esac
+				if [ -n "${nfs_bufpackets}" ]; then
+					sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+				fi
 
-			case ${rpc_statd_enable} in
-			[Yy][Ee][Ss])
-				echo -n ' rpc.statd';	rpc.statd
-				;;
-			esac
-		fi
-		;;
-	*)
-		case ${single_mountd_enable} in
-		[Yy][Ee][Ss])
-			if [ -r /etc/exports ]; then
-				echo -n ' mountd'
+				case ${rpc_lockd_enable} in
+				[Yy][Ee][Ss])
+					echo -n ' rpc.lockd';	rpc.lockd
+					;;
+				esac
 
-				case ${weak_mountd_authentication} in
+				case ${rpc_statd_enable} in
 				[Yy][Ee][Ss])
-					mountd_flags="-n"
+					echo -n ' rpc.statd';	rpc.statd
 					;;
 				esac
+			fi
+			;;
+		*)
+			case ${single_mountd_enable} in
+			[Yy][Ee][Ss])
+				if [ -r /etc/exports ]; then
+					echo -n ' mountd'
 
-				mountd ${mountd_flags}
+					case ${weak_mountd_authentication} in
+					[Yy][Ee][Ss])
+						mountd_flags="-n"
+						;;
+					esac
+
+					mountd ${mountd_flags}
+				fi
+				;;
+			esac
+			;;
+		esac
+
+		case ${nfs_client_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
+				if [ -n "${nfs_access_cache}" ]; then
+			echo -n " NFS access cache time=${nfs_access_cache}"
+			sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
 			fi
 			;;
 		esac
-		;;
-	esac
 
-	case ${nfs_client_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
-		if [ -n "${nfs_access_cache}" ]; then
-		echo -n " NFS access cache time=${nfs_access_cache}"
-		sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \
-			>/dev/null
+		# If /var/db/mounttab exists, some nfs-server has not been
+		# sucessfully notified about a previous client shutdown.
+		# If there is no /var/db/mounttab, we do nothing.
+		if [ -f /var/db/mounttab ]; then
+			rpc.umntall -k
 		fi
-		;;
-	esac
 
-	# If /var/db/mounttab exists, some nfs-server has not been
-	# sucessfully notified about a previous client shutdown.
-	# If there is no /var/db/mounttab, we do nothing.
-	if [ -f /var/db/mounttab ]; then
-		rpc.umntall -k
-	fi
+		case ${amd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' amd'
+			case ${amd_map_program} in
+			[Nn][Oo] | '')
+				;;
+			*)
+				amd_flags="${amd_flags} `eval\
+					${amd_map_program}`"
+				;;
+		esac
 
-	case ${amd_enable} in
-	[Yy][Ee][Ss])
-		echo -n ' amd'
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			amd_flags="${amd_flags} `eval ${amd_map_program}`"
+			if [ -n "${amd_flags}" ]; then
+				amd -p ${amd_flags}\
+					> /var/run/amd.pid 2> /dev/null
+			else
+				amd 2> /dev/null
+			fi
 			;;
 		esac
-
-		if [ -n "${amd_flags}" ]; then
-			amd -p ${amd_flags} > /var/run/amd.pid 2> /dev/null
-		else
-			amd 2> /dev/null
-		fi
 		;;
 	esac
 
diff --git a/etc/rpc b/etc/rpc
index a662bf9..eab4139 100644
--- a/etc/rpc
+++ b/etc/rpc
@@ -1,8 +1,8 @@
 #
 # $FreeBSD$
-# rpc 88/08/01 4.0 RPCSRC; from 1.12   88/02/07 SMI
+# rpc 88/08/01 4.0 RPCSRC; from 1.12   99/07/25 SMI
 #
-portmapper	100000	portmap sunrpc
+rpcbind		100000  portmap sunrpc rpcbind
 rstatd		100001	rstat rstat_svc rup perfmeter
 rusersd		100002	rusers
 nfs		100003	nfsprog
@@ -29,10 +29,39 @@ status		100024
 bootparamd	100026	bootparam
 ypupdated	100028	ypupdate
 keyserv		100029	keyserver
+sunlink_mapper	100033
 tfsd		100037 
 nsed		100038
 nsemntd		100039
-pcnfsd		150001	pcnfs
-amd		300019
+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	ufsd
+pcnfsd		150001	pcnfs
+amd		300019