Allow rwhod to take flags.

PR:		7705
Submitted by:	Johan Karlsson <k@numeri.campus.luth.se>

8 files changed, 16 insertions, 15 deletions

diff --git a/etc/network.subr b/etc/network.subr
index f632d55..ab1c3ac 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.conf b/etc/rc.conf
index 43d9f9b..1f91d1d 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.68 1998/12/27 22:04:12 des Exp $
+#	$Id: rc.conf,v 1.69 1998/12/27 23:00:18 jkh Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -58,6 +58,7 @@ kadmind_server_enable="NO"	# Run kadmind (or NO) -- do not run on
 				# a slave kerberos server
 kerberos_stash=""		# Is the kerberos master key stashed?
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
+rwhod_flags=""			# Flags for rwhod
 amd_enable="NO"			# Run amd service with $amd_flags (or NO).
 amd_flags="-a /net -c 1800 -k i386 -d my.domain -l syslog /host /etc/amd.map"
 amd_map_program="NO"		# Can be set to "ypcat -k amd.master"
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index f632d55..ab1c3ac 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index f632d55..ab1c3ac 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index f632d55..ab1c3ac 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index f632d55..ab1c3ac 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index f632d55..ab1c3ac 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.network b/etc/rc.network
index f632d55..ab1c3ac 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.35 1998/11/15 20:30:04 msmith Exp $
+#	$Id: rc.network,v 1.36 1998/11/27 07:06:11 jkoshy Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -273,7 +273,7 @@ network_pass3() {
     fi
 
     if [ "X${rwhod_enable}" = X"YES" ]; then
-	    echo -n ' rwhod';	rwhod
+	    echo -n ' rwhod';	rwhod ${rwhod_flags}
     fi
 
     # Kerberos runs ONLY on the Kerberos server machine