From 2b250169bbc0480376af5568b2ac0b1dd0f69d58 Mon Sep 17 00:00:00 2001
From: reyk <reyk@openbsd.org>
Date: Tue, 22 Apr 2014 10:24:29 +0000
Subject: [PATCH] Remove kerberosV from etc/

ok deraadt@ guenther@
---
 etc/Makefile                    |  5 +----
 etc/changelist                  |  4 +---
 etc/kerberosV/krb5.conf.example | 27 ---------------------------
 etc/mtree/4.4BSD.dist           | 33 +--------------------------------
 etc/mtree/special               |  4 +---
 5 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 etc/kerberosV/krb5.conf.example

diff --git a/etc/Makefile b/etc/Makefile
index 58dc79a1007..35281c45b98 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.353 2014/04/20 18:06:37 tedu Exp $
+#	$OpenBSD: Makefile,v 1.354 2014/04/22 10:24:29 reyk Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -162,9 +162,6 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/etc/skel/.cvsrc; \
 		${INSTALL} -c -o root -g wheel -m 600 /dev/null \
 		    ${DESTDIR}/etc/skel/.ssh/authorized_keys
-	cd kerberosV; \
-		${INSTALL} -c -o root -g wheel -m 644 krb5.conf.example \
-		    ${DESTDIR}/etc/kerberosV
 	cd amd; \
 		${INSTALL} -c -o root -g wheel -m 644 master.sample \
 		    ${DESTDIR}/etc/amd
diff --git a/etc/changelist b/etc/changelist
index 7058bdc3c97..90cb43f8c74 100644
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.85 2014/04/21 08:42:01 ajacoutot Exp $
+#	$OpenBSD: changelist,v 1.86 2014/04/22 10:24:29 reyk Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -48,7 +48,6 @@
 +/etc/isakmpd/isakmpd.policy
 /etc/isakmpd/local.pub
 +/etc/isakmpd/private/local.key
-/etc/kerberosV/krb5.conf
 /etc/ksh.kshrc
 /etc/ldapd.conf
 /etc/ldpd.conf
@@ -166,7 +165,6 @@
 /var/cron/cron.allow
 /var/cron/cron.deny
 /var/cron/tabs/root
-+/var/kerberosV/m-key
 /var/named/etc/named.conf
 +/var/named/etc/rndc.key
 /var/named/etc/root.hint
diff --git a/etc/kerberosV/krb5.conf.example b/etc/kerberosV/krb5.conf.example
deleted file mode 100644
index 5b9b4b9c16d..00000000000
--- a/etc/kerberosV/krb5.conf.example
+++ /dev/null
@@ -1,27 +0,0 @@
-# $OpenBSD: krb5.conf.example,v 1.7 2013/07/10 05:12:15 ajacoutot Exp $
-#
-# Kerberos 5 minimal configuration example.
-# See krb5.conf(5) and the heimdal info(1) page for more information.
-
-[libdefaults]
-	# local realm(s)
-	default_realm = DOMAIN.TLD
-
-[realms]
-	DOMAIN.TLD = {
-		# list of KDC(s) for this realm
-		kdc = kerberos.domain.tld
-
-		# admin server for this realm
-		admin_server = kerberos.domain.tld
-	}
-
-[kadmin]
-	# default salt string
-	default_keys = v5
-
-[logging]
-	# log to syslog(3)
-	kdc = SYSLOG:INFO:DAEMON
-	kpasswdd = SYSLOG:INFO:AUTH
-	default = SYSLOG:INFO:DAEMON
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 04aaace6ec0..9a773597f9b 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.246 2014/03/24 09:24:09 sthen Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.247 2014/04/22 10:24:29 reyk Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -157,11 +157,6 @@ ufqdn		uname=root mode=0755
 # ./etc/isakmpd
 ..
 
-# ./etc/kerberosV
-kerberosV
-# ./etc/kerberosV
-..
-
 # ./etc/ldap
 ldap
 
@@ -312,27 +307,6 @@ std             gname=bin uname=root mode=0755
 # ./usr/include/g++
 ..
 
-# ./usr/include/kerberosV
-kerberosV		gname=bin uname=root mode=0755
-
-# ./usr/include/kerberosV/gssapi
-gssapi			gname=bin uname=root mode=0755
-# ./usr/include/kerberosV/gssapi
-..
-
-# ./usr/include/kerberosV/kadm5
-kadm5			gname=bin uname=root mode=0755
-# ./usr/include/kerberosV/kadm5
-..
-
-# ./usr/include/kerberosV/krb5
-krb5			gname=bin uname=root mode=0755
-# ./usr/include/kerberosV/krb5
-..
-
-# ./usr/include/kerberosV
-..
-
 # ./usr/include/libmilter
 libmilter		gname=bin uname=root mode=0755
 # ./usr/include/libmilter
@@ -1161,11 +1135,6 @@ phantasia        uname=root gname=games mode=0775
 # ./var/games
 ..
 
-# ./var/kerberosV
-kerberosV	uname=root gname=wheel mode=0700
-# ./var/kerberosV
-..
-
 # ./var/log
 log
 
diff --git a/etc/mtree/special b/etc/mtree/special
index 342599553f7..fb7ecb837bc 100644
--- a/etc/mtree/special
+++ b/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.101 2014/04/21 08:42:01 ajacoutot Exp $
+#	$OpenBSD: special,v 1.102 2014/04/22 10:24:29 reyk Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -42,8 +42,6 @@ isakmpd		type=dir mode=0755 uname=root gname=wheel
 isakmpd.conf	type=file mode=0600 uname=root gname=wheel optional
 isakmpd.policy	type=file mode=0600 uname=root gname=wheel optional
 ..	#isakmpd
-kerberosV	type=dir mode=0755 uname=root gname=wheel optional ignore
-..	#kerberosV
 ldapd.conf	type=file mode=0600 uname=root gname=wheel
 ldpd.conf	type=file mode=0600 uname=root gname=wheel
 login.conf	type=file mode=0644 uname=root gname=wheel
-- 
2.20.1