Enable the SecureRPC bits in rc.conf, if the Administrator wants them.

8 files changed, 74 insertions, 8 deletions

diff --git a/etc/network.subr b/etc/network.subr
index 2fbdf4f..1e49f77 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }
diff --git a/etc/rc.conf b/etc/rc.conf
index b680749..eb537f3 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.42 1998/04/02 15:17:35 ache Exp $
+#	$Id$
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -61,6 +61,9 @@ 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).
 portmap_enable="YES"		# Run the portmapper service (or NO).
 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.
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 2fbdf4f..1e49f77 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 2fbdf4f..1e49f77 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 2fbdf4f..1e49f77 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 2fbdf4f..1e49f77 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 2fbdf4f..1e49f77 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }
diff --git a/etc/rc.network b/etc/rc.network
index 2fbdf4f..1e49f77 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.19 1998/02/20 14:45:06 brian Exp $
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -197,6 +197,15 @@ network_pass2() {
 	    fi
     fi
 
+    # Start keyserv if we are running Secure RPC
+    if [ "X${keyserv_enable}" = X"YES" ]; then
+	    echo -n ' keyserv';		keyserv ${keyserv_flags}
+    fi
+    # Start ypupdated if we are running Secure RPC and we are NIS master
+    if [ "X$rpc_ypupdated_enable" = X"YES" ]; then
+	    echo -n ' rpc.ypupdated';	rpc.ypupdated
+    fi
+
     echo '.'
     network_pass2_done=YES
 }