From 5aa15eafe17693181bf800e1e7d5310a0121f3fe Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Mon, 24 Aug 2009 11:52:28 +0200
Subject: [PATCH] remove more kerberos/heimdal

---
 etc/defaults/make.conf     |  4 ----
 etc/rc.d/Makefile          |  2 +-
 etc/rc.d/kpasswdd          | 21 ---------------------
 share/man/man5/make.conf.5 | 12 ------------
 4 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 etc/rc.d/kpasswdd

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 45687ed658..726e276306 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -177,10 +177,6 @@ THREAD_LIB?=	thread_xu
 # To build the installer as part of buildworld.
 #WANT_INSTALLER=yes
 #
-# If you want to use the k5su utility, define this to have it installed
-# set-user-ID.
-#ENABLE_SUID_K5SU=	yes
-#
 # top(1) uses a hash table for the user names.  The size of this hash
 # can be tuned to match the number of local users.  The table size should
 # be a prime number approximately twice as large as the number of lines in
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 81ad248469..7f531cc7b2 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -13,7 +13,7 @@ FILES=	DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz \
 	fixbootfile fsck ftpd hostapd hostname \
 	inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \
 	ipnat ipsec ipxrouted isdnd jail \
-	kadmind keyserv kpasswdd \
+	keyserv \
 	ldconfig local localdaemons lockd lpd \
 	mixer motd mountcritlocal mountcritremote \
 	mountd moused mroute6d mrouted msgs \
diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd
deleted file mode 100644
index 6a3c52f220..0000000000
--- a/etc/rc.d/kpasswdd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $
-# $DragonFly: src/etc/rc.d/kpasswdd,v 1.4 2006/10/24 09:24:15 victor Exp $
-#
-
-# PROVIDE: kpasswdd
-# REQUIRE: kadmin
-# BEFORE: DAEMON
-
-. /etc/rc.subr
-
-name="kpasswdd"
-load_rc_config $name
-rcvar="kpasswdd_server_enable"
-unset start_cmd
-command="${kpasswdd_server_program}"
-command_args="&"
-required_vars="kadmind5_server_enable"
-
-run_rc_command "$1"
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 584c9989e0..1dbd8e8a39 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -302,13 +302,6 @@ Set to not build modules with the kernel.
 The following list provides a name and short description for variables
 that are used during the world build:
 .Bl -tag -width Ar
-.It Va ENABLE_SUID_K5SU
-.Pq Vt bool
-Set this if you wish to use the k5su utility.
-Otherwise, it will be installed without the set-user-ID bit set.
-This is only relevant if
-.Va WANT_KERBEROS
-is defined.
 .It Va ENABLE_SUID_SSH
 .Pq Vt bool
 Set this to install
@@ -543,11 +536,6 @@ to determine if you can legally use IDEA.
 .It Va WANT_INSTALLER
 .Pq Vt bool
 Set to build the installer.
-.It Va WANT_KERBEROS
-.Pq Vt bool
-Set this to build Kerberos5 (KTH Heimdal).
-.Em WARNING !
-This is still experimental code.
 .El
 .Pp
 The following list provides a name and short description for variables
-- 
2.11.4.GIT