From e33b71da5ee4c18045cda4430cee353e8c596d2f Mon Sep 17 00:00:00 2001
From: hin <>
Date: Sun, 9 Jun 2002 21:15:54 +0000
Subject: [PATCH] Remove startup stuff for Kerberos 4 servers.

ok deraadt@
---
 src/etc/rc      | 17 +----------------
 src/etc/rc.conf |  4 +---
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index a962393c..adc4a608 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.196 2002/06/07 08:54:48 beck Exp $
+#	$OpenBSD: rc,v 1.197 2002/06/09 21:15:54 hin Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -564,21 +564,6 @@ if [ -f /sbin/kbd -a -f /etc/kbdtype ]; then
 	kbd `cat /etc/kbdtype`
 fi
 
-# KerberosIV runs ONLY on the KDC servers
-# Kadmin runs only on the master server
-if [ X${krb4_master_kdc} = X"YES" ]; then
-	echo 'KerberosIV KDC'
-	/usr/libexec/kerberos >> /var/log/kerberos.log &
-	/usr/libexec/kadmind -n >> /var/log/kadmind.log &
-fi
-
-# Kpropd runs only on Kerberos slave servers
-if [ X${krb4_slave_kdc} = X"YES" ]; then
-	echo 'kerberos slave server'
-	/usr/libexec/kerberos -s >> /var/log/kerberos.log &
-	/usr/libexec/kpropd -i &
-fi
-
 # KerberosV master KDC
 if [ X${krb5_master_kdc} = X"YES" ]; then
 	echo 'KerberosV master KDC'
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 09ba1de1..33e8323e 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.72 2002/01/08 12:04:43 tholo Exp $
+#	$OpenBSD: rc.conf,v 1.73 2002/06/09 21:15:54 hin Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -59,8 +59,6 @@ inetd=YES		# almost always needed
 check_quotas=YES	# NO may be desirable in some YP environments
 ntpd=YES		# run ntpd if it exists
 
-krb4_server_kdc=NO	# kerberos server. run 'info kth-krb' for assistance.
-krb4_slave_kdc=NO	# kerberos slave server.
 krb5_master_kdc=NO	# KerberosV master KDC. Run 'info heimdal' for help.
 krb5_slave_kdc=NO	# KerberosV slave KDC.
 afs=NO			# mount and run afs