Index: rc.network
===================================================================
RCS file: /home/ncvs/src/etc/rc.network,v
retrieving revision 1.137
diff -u -r1.137 rc.network
--- rc.network	20 Sep 2002 18:31:55 -0000	1.137
+++ rc.network	26 Sep 2002 16:09:34 -0000
@@ -796,9 +796,9 @@
 	esac
 
 	# Kerberos servers run ONLY on the Kerberos server machine
-	case ${kerberos4_server_enable} in
+	case ${krb4_kdc_enable} in
 	[Yy][Ee][Ss])
-		case ${kerberos_stash} in
+		case ${krb4_stash} in
 		[Yy][Ee][Ss])
 			stash=-n
 			;;
@@ -808,30 +808,54 @@
 		esac
 
 		echo -n ' kerberosIV'
-		${kerberos4_server} ${stash} >> /var/log/kerberos.log &
+		${krb4_kdc_program} ${krb4_kdc_flags} ${stash} >> /var/log/kerberos.log &
 
-		case ${kadmind4_server_enable} in
+		case ${krb4_kadmind_enable} in
 		[Yy][Ee][Ss])
 			echo -n ' kadmindIV'
 			(
 				sleep 20;
-				${kadmind4_server} ${stash} >/dev/null 2>&1 &
+				${krb4_kadmind_program} ${krb4_kadmind_flags} ${stash} >/dev/null 2>&1 &
 			) &
 			;;
 		esac
-		unset stash_flag
+		unset stash
 		;;
 	esac
 
-	case ${kerberos5_server_enable} in
+	case ${krb5_kdb_enable} in
 	[Yy][Ee][Ss])
 		echo -n ' kerberos5'
-		${kerberos5_server} &
+		${krb5_kdc_program} ${krb5_kdc_flags} &
 
-		case ${kadmind5_server_enable} in
+		case ${krb5_kadmind_enable} in
 		[Yy][Ee][Ss])
 			echo -n ' kadmind5'
-			${kadmind5_server} &
+			${krb5_kadmind_program} ${krb5_kadmind_flags} &
+			;;
+		esac
+		;;
+
+		case ${krb5_kpasswdd_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' kpasswdd5'
+			${krb5_kpasswdd_program} ${krb5_kpasswdd_flags} &
+			;;
+		esac
+		;;
+
+		case ${krb5_ipropd_master_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' ipropd-master'
+			${krb5_ipropd_master_program} ${krb5_ipropd_master_flags} &
+			;;
+		esac
+		;;
+
+		case ${krb5_ipropd_slave_enable} in
+		[Yy][Ee][Ss])
+			echo -n ' ipropd-slave'
+			${krb5_ipropd_slave_program} ${krb5_ipropd_slave_flags} &
 			;;
 		esac
 		;;
Index: defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.159
diff -u -r1.159 rc.conf
--- defaults/rc.conf	5 Sep 2002 20:14:40 -0000	1.159
+++ defaults/rc.conf	26 Sep 2002 16:01:53 -0000
@@ -143,15 +143,28 @@
 #
 # kerberos. Do not run the admin daemons on slave servers
 #
-kerberos4_server_enable="NO"	# Run a kerberos IV master server (or NO).
-kerberos4_server="/usr/sbin/kerberos"	# path to kerberos IV KDC
-kadmind4_server_enable="NO"	# Run kadmind (or NO)
-kadmind4_server="/usr/sbin/kadmind"	# path to kerberos IV admin daemon
-kerberos5_server_enable="NO"	# Run a kerberos 5 master server (or NO).
-kerberos5_server="/usr/libexec/kdc"	# path to kerberos 5 KDC
-kadmind5_server_enable="NO"	# Run kadmind (or NO)
-kadmind5_server="/usr/libexec/k5admind"	# path to kerberos 5 admin daemon
-kerberos_stash="NO"		# Is the kerberos master key stashed?
+krb4_kdc_enable="NO"		# Run a krb4 master server (or NO).
+krb4_kdc_program="/usr/sbin/kerberos"	# path to krb4 KDC
+krb4_kdc_flags=""		# Flags for krb4 kdc
+krb4_kadmind_enable="NO"	# Run krb4 kadmind (or NO)
+krb4_kadmind_program="/usr/sbin/kadmind"	# path to krb4 admin daemon
+krb4_kadmind_flags=""		# Flags for krb4 kadmind
+krb4_stash="NO"			# Is the krb4 master key stashed?
+krb5_kdc_enable="NO"		# Run a krb5 master server (or NO).
+krb5_kdc_program="/usr/libexec/kdc"	# path to krb5 KDC
+krb5_kdc_flags=""		# flags for krb5 KDC
+krb5_kadmind_enable="NO"	# Run kadmind (or NO)
+krb5_kadmind_program="/usr/libexec/k5admind"	# path to krb5 admin daemon
+krb5_kadmind_flags=""		# flags for krb5 admin daemon
+krb5_kpasswdd_enable="NO"	# Run kpasswdd (or NO)
+krb5_kpasswdd_program="/usr/libexec/k5passwdd"	# path to krb5 password daemon
+krb5_kpasswdd_flags=""		# flags for krb5 password daemon
+krb5_ipropd_master_enable="NO"	# Run ipropd-master (or NO)
+krb5_ipropd_master_program="/usr/libexec/ipropd-master"	# path to ipropd-master
+krb5_ipropd_master_flags=""	# flags to ipropd-master
+krb5_ipropd_slave_enable="NO"	# Run ipropd-slave (or NO)
+krb5_ipropd_slave_program="/usr/libexec/ipropd-slave"	# path to ipropd-slave
+krb5_ipropd_slave_flags=""	# flags to ipropd-slave
 
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod