summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Insulander <hin@cvs.openbsd.org>2002-06-09 21:15:55 +0000
committerHans Insulander <hin@cvs.openbsd.org>2002-06-09 21:15:55 +0000
commit16c23ef9b20e48459e73668d34c6284c52228722 (patch)
tree238e33bb431cb023937571be9828416cf99b219b
parent27255f9af239232f89515556d3a70afe9e928015 (diff)
Remove startup stuff for Kerberos 4 servers.
ok deraadt@
-rw-r--r--etc/rc17
-rw-r--r--etc/rc.conf4
2 files changed, 2 insertions, 19 deletions
diff --git a/etc/rc b/etc/rc
index a962393c116..adc4a608063 100644
--- a/etc/rc
+++ b/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/etc/rc.conf b/etc/rc.conf
index 09ba1de1483..33e8323ee0e 100644
--- a/etc/rc.conf
+++ b/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