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

1 files changed, 118 insertions, 112 deletions

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