From 207e76cc3ca6e57b43bfbd249c93e8db50434805 Mon Sep 17 00:00:00 2001
From: Jeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Date: Tue, 5 Aug 2003 07:45:44 +0000
Subject: [PATCH] Remove kerberosIV from the build.

Both normal builds and kerberos5 builds have been tested to work.
---
 Makefile.inc1                                 |  18 +-
 README                                        |   4 +-
 bin/rcp/Makefile                              |  16 +-
 etc/defaults/make.conf                        |   8 +-
 etc/mtree/BSD.root.dist                       |   4 +-
 etc/pam.conf                                  |   7 +-
 gnu/lib/libdialog/TESTS/tree.c                |   3 +-
 gnu/usr.bin/cvs/cvs/Makefile                  |  13 +-
 kerberos5/Makefile.inc                        |  14 +-
 kerberos5/lib/Makefile                        |   8 +-
 kerberos5/lib/libkrb5/Makefile                |   5 +-
 kerberos5/lib/libtelnet/Makefile              |   9 +-
 kerberos5/libexec/hprop/Makefile              |   6 +-
 kerberos5/libexec/hpropd/Makefile             |   6 +-
 kerberos5/libexec/ipropd-master/Makefile      |   6 +-
 kerberos5/libexec/ipropd-slave/Makefile       |   6 +-
 kerberos5/libexec/k5admind/Makefile           |   7 +-
 kerberos5/libexec/k5passwdd/Makefile          |   6 +-
 kerberos5/libexec/kdc/Makefile                |   7 +-
 kerberos5/libexec/telnetd/Makefile            |  14 +-
 kerberos5/usr.bin/k5admin/Makefile            |   6 +-
 kerberos5/usr.bin/k5destroy/Makefile          |   6 +-
 kerberos5/usr.bin/k5init/Makefile             |   6 +-
 kerberos5/usr.bin/k5list/Makefile             |   6 +-
 kerberos5/usr.bin/k5passwd/Makefile           |   6 +-
 kerberos5/usr.bin/k5su/Makefile               |   6 +-
 kerberos5/usr.bin/telnet/Makefile             |  14 +-
 kerberos5/usr.sbin/k5stash/Makefile           |   6 +-
 kerberos5/usr.sbin/ktutil/Makefile            |   6 +-
 lib/Makefile                                  |   5 +-
 lib/libpam/libpam/Makefile                    |   5 +-
 lib/libpam/modules/Makefile                   |   5 +-
 libexec/Makefile                              |   5 +-
 release/Makefile                              |  12 +-
 .../installation/common/upgrade.sgml          |   3 +-
 .../installation/common/upgrade.sgml          |   3 +-
 .../installation/common/upgrade.sgml          |   3 +-
 release/sysinstall/dist.c                     |   6 +-
 release/sysinstall/dist.h                     |   9 +-
 release/sysinstall/installUpgrade.c           |   3 +-
 release/sysinstall/menus.c                    |  15 +-
 sbin/dump/Makefile                            |  15 +-
 sbin/mount_nfs/mount_nfs.c                    |   7 +-
 sbin/nfsd/Makefile                            |   9 +-
 sbin/nfsd/nfsd.c                              |   7 +-
 sbin/restore/Makefile                         |  15 +-
 secure/lib/Makefile                           |   4 +-
 secure/lib/libssh/Makefile                    |   5 +-
 secure/libexec/Makefile                       |   4 +-
 secure/usr.bin/Makefile                       |   4 +-
 secure/usr.bin/ssh/Makefile                   |   9 +-
 secure/usr.sbin/sshd/Makefile                 |  10 +-
 share/examples/cvsup/cvs-supfile              |   4 +-
 share/examples/cvsup/stable-supfile           |   4 +-
 share/examples/cvsup/standard-supfile         |   4 +-
 share/man/man5/make.conf.5                    |   5 +-
 share/man/man7/hier.7                         |  30 +--
 share/mk/bsd.libnames.mk                      |   6 +-
 tools/make_libdeps.sh                         |   4 +-
 usr.bin/Makefile                              |   5 +-
 usr.bin/passwd/Makefile                       |  15 +-
 usr.bin/rlogin/Makefile                       |  15 +-
 usr.bin/rsh/Makefile                          |  16 +-
 usr.bin/su/Makefile                           |   9 +-
 usr.bin/su/su.c                               | 188 +-----------------
 usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur           |   3 +-
 usr.sbin/ctm/mkCTM/ctm_conf.src-cur           |   3 +-
 usr.sbin/ctm/mkCTM/ctm_conf.src-special       |   3 +-
 68 files changed, 102 insertions(+), 604 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 61ea5cd5ac..fe3f9eee12 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,9 +1,8 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.3 2003/08/03 16:45:13 dillon Exp $
+# $DragonFly: src/Makefile.inc1,v 1.4 2003/08/05 07:45:39 asmodai Exp $
 #
 # Make command line options:
-#	-DMAKE_KERBEROS4 to build KerberosIV
 #	-DMAKE_KERBEROS5 to build Kerberos5
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
@@ -63,10 +62,6 @@ SUBDIR+= games
 .if exists(${.CURDIR}/gnu)
 SUBDIR+= gnu
 .endif
-.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
-    !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4)
-SUBDIR+= kerberosIV
-.endif
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
     !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
 SUBDIR+= kerberos5
@@ -611,11 +606,6 @@ _fortran= gnu/usr.bin/cc/f771
 _perl=	gnu/usr.bin/perl/miniperl
 .endif
 
-.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
-    !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
-_libroken4= kerberosIV/lib/libroken
-.endif
-
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
     !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
 _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
@@ -706,12 +696,6 @@ _prebuild_libs+=	kerberos5/lib/libroken
 _generic_libs+=	kerberos5/lib
 .endif
 
-.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
-_prebuild_libs+=	kerberosIV/lib/libkrb
-kerberosIV/lib/libkrb__L: lib/libcrypt__L
-_generic_libs+=	kerberosIV/lib
-.endif
-
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libmd \
 		lib/libncurses lib/libopie lib/libradius lib/libskey \
 		lib/libtacplus lib/libutil \
diff --git a/README b/README
index 7813f442e1..00306957a2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
 $FreeBSD: src/README,v 1.15.2.4 2002/04/26 16:01:35 bmah Exp $
-$DragonFly: src/README,v 1.2 2003/06/17 04:21:10 dillon Exp $
+$DragonFly: src/README,v 1.3 2003/08/05 07:45:39 asmodai Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -54,8 +54,6 @@ include		System include files.
 
 kerberos5	Kerberos5 (Heimdal) package.
 
-kerberosIV	KerberosIV (eBones) package.
-
 lib		System libraries.
 
 libexec		System daemons.
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 61e43c08fb..bcbddc9b3d 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD: src/bin/rcp/Makefile,v 1.16.2.2 2002/07/19 07:54:51 jmallett Exp $
-# $DragonFly: src/bin/rcp/Makefile,v 1.2 2003/06/17 04:22:50 dillon Exp $
+# $DragonFly: src/bin/rcp/Makefile,v 1.3 2003/08/05 07:45:39 asmodai Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
@@ -8,20 +8,6 @@ CFLAGS+=-DBINDIR=${BINDIR}
 WARNS=	0
 WFORMAT=0
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO}
-CFLAGS+=-DCRYPT -DHAVE_CONFIG_H \
-	-I${.CURDIR}/../../kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd \
-	-I${.CURDIR}
-LDADD=	-lutil -lkrb -lcrypto
-DISTRIBUTION=	krb4
-.PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-.endif
-
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index d5b0d0fa6e..d1327969f8 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $
-# $DragonFly: src/etc/defaults/make.conf,v 1.4 2003/08/03 16:45:14 dillon Exp $
+# $DragonFly: src/etc/defaults/make.conf,v 1.5 2003/08/05 07:45:39 asmodai Exp $
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
@@ -302,12 +302,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # /usr/ports.  
 #WRKDIRPREFIX=	/var/tmp
 #
-# Kerberos IV
-# If you want KerberosIV (KTH eBones), define this:
-#
-#MAKE_KERBEROS4=	yes
-#
-#
 # Kerberos 5
 # If you want Kerberos 5 (KTH Heimdal), define this:
 #
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 2133d482b6..a1c2376eab 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.45.2.4 2002/06/10 15:33:27 obrien Exp $
-# $DragonFly: src/etc/mtree/BSD.root.dist,v 1.3 2003/07/24 06:35:36 dillon Exp $
+# $DragonFly: src/etc/mtree/BSD.root.dist,v 1.4 2003/08/05 07:45:39 asmodai Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -25,8 +25,6 @@
         ..
         isdn            mode=0700
         ..
-        kerberosIV
-        ..
         mail
         ..
         mtree
diff --git a/etc/pam.conf b/etc/pam.conf
index 18fea44357..1a9050ccf9 100644
--- a/etc/pam.conf
+++ b/etc/pam.conf
@@ -4,7 +4,7 @@
 # utilities use.  See pam(8) for a description of its format.
 #
 # $FreeBSD: src/etc/pam.conf,v 1.6.2.18 2003/02/15 17:20:27 des Exp $
-# $DragonFly: src/etc/Attic/pam.conf,v 1.2 2003/06/17 04:24:45 dillon Exp $
+# $DragonFly: src/etc/Attic/pam.conf,v 1.3 2003/08/05 07:45:39 asmodai Exp $
 #
 # service-name	module-type	control-flag	module-path	arguments
 #
@@ -48,7 +48,6 @@ login	auth	sufficient	pam_skey.so
 login	auth	sufficient	pam_opie.so			no_fake_prompts
 #login	auth	requisite	pam_opieaccess.so
 login	auth	requisite	pam_cleartext_pass_ok.so
-#login	auth	sufficient	pam_kerberosIV.so		try_first_pass
 #login	auth	sufficient	pam_krb5.so			try_first_pass
 login	auth	required	pam_unix.so			try_first_pass
 login	account	required	pam_unix.so
@@ -60,7 +59,6 @@ ftpd	auth	sufficient	pam_skey.so
 ftpd	auth	sufficient	pam_opie.so			no_fake_prompts
 #ftpd	auth	requisite	pam_opieaccess.so
 ftpd	auth	requisite	pam_cleartext_pass_ok.so
-#ftpd	auth	sufficient	pam_kerberosIV.so		try_first_pass
 #ftpd	auth	sufficient	pam_krb5.so			try_first_pass
 ftpd	auth	required	pam_unix.so			try_first_pass
 
@@ -69,7 +67,6 @@ ftpd	auth	required	pam_unix.so			try_first_pass
 sshd	auth	sufficient	pam_skey.so
 sshd	auth	sufficient	pam_opie.so			no_fake_prompts
 #sshd	auth	requisite	pam_opieaccess.so
-#sshd	auth	sufficient	pam_kerberosIV.so		try_first_pass
 #sshd	auth	sufficient	pam_krb5.so			try_first_pass
 sshd	auth	required	pam_unix.so			try_first_pass
 sshd	account	required	pam_unix.so
@@ -85,7 +82,6 @@ xserver	auth	required	pam_permit.so
 # XDM is difficult; it fails or moans unless there are modules for each
 # of the four management groups; auth, account, session and password.
 xdm	auth	required	pam_unix.so
-#xdm	auth	sufficient	pam_kerberosIV.so		try_first_pass
 #xdm	auth	sufficient	pam_krb5.so			try_first_pass
 xdm	account	required	pam_unix.so			try_first_pass
 xdm	session	required	pam_deny.so
@@ -93,7 +89,6 @@ xdm	password required	pam_deny.so
 
 # GDM (GNOME Display Manager)
 gdm	auth	required	pam_unix.so
-#gdm	auth	sufficient	pam_kerberosIV.so		try_first_pass
 #gdm	auth	sufficient	pam_krb5.so			try_first_pass
 gdm	account	required	pam_unix.so			try_first_pass
 gdm	session	required	pam_permit.so
diff --git a/gnu/lib/libdialog/TESTS/tree.c b/gnu/lib/libdialog/TESTS/tree.c
index 81f37617f0..f65fed6045 100644
--- a/gnu/lib/libdialog/TESTS/tree.c
+++ b/gnu/lib/libdialog/TESTS/tree.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1998, Anatoly A. Orehovsky
  *
  * $FreeBSD: src/gnu/lib/libdialog/TESTS/tree.c,v 1.2 2000/01/10 11:52:10 phantom Exp $
- * $DragonFly: src/gnu/lib/libdialog/TESTS/tree.c,v 1.2 2003/06/17 04:25:44 dillon Exp $
+ * $DragonFly: src/gnu/lib/libdialog/TESTS/tree.c,v 1.3 2003/08/05 07:45:39 asmodai Exp $
  */
 
 #include <stdio.h>
@@ -35,7 +35,6 @@ unsigned char *names[] = {
 	"/stand/info/src",
 	"/etc",
 	"/etc/gnats",
-	"/etc/kerberosIV",
 	"/etc/mtree",
 	"/etc/namedb",
 	"/etc/ppp",
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index aebee55456..2bb47880e5 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.32.2.6 2003/01/21 23:06:51 peter Exp $
-# $DragonFly: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.2 2003/06/17 04:25:45 dillon Exp $
+# $DragonFly: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.3 2003/08/05 07:45:39 asmodai Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
@@ -31,17 +31,6 @@ CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \
 DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
-LDADD+=	-lkrb -lcrypto -lcom_err
-DPADD+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
-DISTRIBUTION=	krb4
-# XXX do we want to mess with this?  It's probably not really worth it for
-# the public freebsd stuff, but others might want it.  It's an optional
-# feature anyway, the -x switch is needed to activate it.
-CFLAGS+= -DENCRYPTION
-.endif
-
 #
 # Regression test support
 #
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 2d78b1cbb0..eca91e20d1 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,21 +1,16 @@
 # $FreeBSD: src/kerberos5/Makefile.inc,v 1.5.2.5 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/Makefile.inc,v 1.2 2003/06/17 04:26:16 dillon Exp $
+# $DragonFly: src/kerberos5/Makefile.inc,v 1.3 2003/08/05 07:45:39 asmodai Exp $
 
 DISTRIBUTION?=	krb5
 
 .if !defined(INCLUDEOBJDIR)
 
-KRB4DIR=	${.CURDIR}/../../../crypto/kerberosIV
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 ROKENDIR=	${.CURDIR}/../../lib/libroken
 TELNETDIR=	${.CURDIR}/../../../crypto/telnet
 
 CFLAGS+=-Wall -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
 
-.if defined(MAKE_KERBEROS4)
-CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4
-.endif
-
 CFLAGS+=-DINET6
 
 .if exists(${.OBJDIR}/../../include)
@@ -48,12 +43,6 @@ VERSOBJDIR=	${.OBJDIR}/../../lib/libvers
 VERSOBJDIR=	${.CURDIR}/../../lib/libvers
 .endif
 
-.if exists(${.OBJDIR}/../../lib/libkrb4)
-KRB4OBJDIR=	${.OBJDIR}/../../lib/libkrb4
-.else
-KRB4OBJDIR=	${.CURDIR}/../../lib/libkrb4
-.endif
-
 .if exists(${.OBJDIR}/../../lib/libkrb5)
 KRB5OBJDIR=	${.OBJDIR}/../../lib/libkrb5
 .else
@@ -160,7 +149,6 @@ CLEANFILES+=	make-roken.c make-roken roken.h
 
 .else
 
-KRB4DIR=	${.CURDIR}/../../crypto/kerberosIV
 KRB5DIR=	${.CURDIR}/../../crypto/heimdal
 ROKENDIR=	${.CURDIR}/../../lib/libroken
 
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index e49359d6f7..6b3d0dd21a 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD: src/kerberos5/lib/Makefile,v 1.2.2.4 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/lib/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $DragonFly: src/kerberos5/lib/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
-SUBDIR=	libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
-.if defined(MAKE_KERBEROS4)
-SUBDIR+=libkafs5
-.endif
-SUBDIR+=libtelnet
+SUBDIR=	libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet
 .include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 31dc51fd52..99be8b19af 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.3.2.5 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/lib/libkrb5/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $DragonFly: src/kerberos5/lib/libkrb5/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 LIB=	krb5
 CFLAGS+=-I${KRB5DIR}/lib/krb5 \
@@ -9,9 +9,6 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 \
 	-I${KRB5DIR}/include \
 	-I${KRB5OBJDIR} \
 	-I${ASN1OBJDIR}
-.if defined(MAKE_KERBEROS4)
-CFLAGS+=-I${KRB4DIR}/include
-.endif
 SRCS=	\
 	acl.c \
 	add_et_list.c \
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index 3a9337aea7..ef0d3c4b22 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -1,17 +1,12 @@
 # $FreeBSD: src/kerberos5/lib/libtelnet/Makefile,v 1.14.2.4 2003/04/24 19:13:59 nectar Exp $
-# $DragonFly: src/kerberos5/lib/libtelnet/Attic/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $DragonFly: src/kerberos5/lib/libtelnet/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 LIB=		telnet
 
 INTERNALLIB=	yes
 
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
-		enc_des.c sra.c pk.c
-.if defined(MAKE_KERBEROS4)
-SRCS+=		kerberos.c
-CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
-.endif
-SRCS+=		kerberos5.c
+		enc_des.c sra.c pk.c kerberos5.c
 
 #WARNS?=		2
 
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 6e2ef23a96..f5f9624005 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.3.2.3 2002/07/25 09:33:14 ru Exp $
-# $DragonFly: src/kerberos5/libexec/hprop/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/hprop/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		hprop
 SRCS=		hprop.c mit_dump.c v4_dump.c hprop.h kadb.h hdb_err.h
@@ -13,10 +13,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs -lkdb
-_krb4deps=	${LIBKRB} ${LIBKAFS} ${LIBKDB}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
 		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 313876b41b..41a47c5a5f 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.3.2.3 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/libexec/hpropd/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/hpropd/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		hpropd
 SRCS=		hpropd.c hprop.h hdb_err.h
@@ -13,10 +13,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs -lkdb
-_krb4deps=	${LIBKRB} ${LIBKAFS} ${LIBKDB}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 4bcfc20f9d..0cd21a6709 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.3.2.3 2002/09/23 14:00:44 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/ipropd-master/Makefile,v 1.2 2003/06/17 04:26:17 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/ipropd-master/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		ipropd-master
 SRCS=		ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
@@ -13,10 +13,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		\
 		-L${KADM5SOBJDIR} -lkadm5srv \
 		-L${KRB5OBJDIR} -lkrb5 \
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 6268e46c2f..2ac7f3d587 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.3.2.3 2002/09/23 14:00:48 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		ipropd-slave
 SRCS=		ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
@@ -13,10 +13,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		\
 		-L${KADM5SOBJDIR} -lkadm5srv \
 		-L${KRB5OBJDIR} -lkrb5 \
diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
index 7fe8d9fa4e..b6a1f7fc39 100644
--- a/kerberos5/libexec/k5admind/Makefile
+++ b/kerberos5/libexec/k5admind/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.4.2.3 2002/09/23 14:00:48 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/k5admind/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/k5admind/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		k5admind
 SRCS=		kadmind.c server.c kadm_conn.c \
@@ -15,11 +15,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-SRCS+=		version4.c
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		\
 		-L${KADM5SOBJDIR} -lkadm5srv \
 		-L${KRB5OBJDIR} -lkrb5 \
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
index 22bcf9b5cf..0d0497d62b 100644
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ b/kerberos5/libexec/k5passwdd/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.4.2.4 2002/09/01 04:22:02 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/k5passwdd/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/k5passwdd/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		k5passwdd
 SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
@@ -14,10 +14,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
 		${_krb4libs} \
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index ba98f52478..db90b2602b 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.3.2.4 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/libexec/kdc/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/kdc/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		kdc
 SRCS=		\
@@ -21,11 +21,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-SRCS+=	524.c kerberos4.c kaserver.c rx.h
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index f78913e9a9..2382aa407f 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.15.2.2 2003/04/24 19:14:00 nectar Exp $
-# $DragonFly: src/kerberos5/libexec/telnetd/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/libexec/telnetd/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
@@ -17,18 +17,10 @@ CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
 
 WARNS?=		2
 
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+=		${LIBKRB} ${LIBCOM_ERR}
-LDADD+=		-lkrb -lcom_err
-.endif
-
-DPADD+=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
 		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
 		${LIBCRYPT} ${LIBPAM}
-LDADD+=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
 		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \
 		-L${ROKENOBJDIR} -lroken -lcom_err \
 		-lcrypt ${MINUSLPAM}
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index 1287145c70..da63d970ae 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/k5admin/Makefile,v 1.4.2.2 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5admin/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/k5admin/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		k5admin
 SRCS=		\
@@ -34,10 +34,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
index 34fa35792d..d4d69a27a0 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/k5destroy/Makefile,v 1.4.2.3 2002/07/25 09:33:15 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5destroy/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/k5destroy/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $
 
 PROG=		k5destroy
 SRCS=		kdestroy.c krb5_err.h heim_err.h k524_err.h
@@ -11,10 +11,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
index 2e06ec6ee2..6542301afb 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/k5init/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5init/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/k5init/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		k5init
 SRCS=		kinit.c asn1_err.h krb5_err.h heim_err.h \
@@ -12,10 +12,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
-_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
index e66a80bf62..133f630411 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/k5list/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5list/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/k5list/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		k5list
 SRCS=		klist.c krb5_err.h heim_err.h k524_err.h
@@ -11,10 +11,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
index 13ebd5e4c3..77b84b93c4 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/k5passwd/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5passwd/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/k5passwd/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		k5passwd
 SRCS=		kpasswd.c krb5_err.h heim_err.h k524_err.h
@@ -10,10 +10,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kpasswd \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
 		${_krb4libs} \
diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile
index 1d966062e3..867d6c7591 100644
--- a/kerberos5/usr.bin/k5su/Makefile
+++ b/kerberos5/usr.bin/k5su/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.1.2.6 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.bin/k5su/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/k5su/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		k5su
 SRCS=		su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
@@ -12,10 +12,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
 NOMAN=		true
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
-_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 2348e8793f..04501c30e7 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.bin/telnet/Makefile,v 1.16.2.2 2003/04/24 19:14:00 nectar Exp $
-# $DragonFly: src/kerberos5/usr.bin/telnet/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.bin/telnet/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		telnet
 
@@ -14,18 +14,10 @@ CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
 
 WARNS?=		2
 
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+=		${LIBKRB} ${LIBCOM_ERR}
-LDADD+=		-lkrb -lcom_err
-.endif
-
-DPADD+=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
 		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
 		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD+=		-ltermcap ${LIBTELNET} -lmp \
+LDADD=		-ltermcap ${LIBTELNET} -lmp \
 		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \
 		-L${ROKENOBJDIR} -lroken \
 		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
index e42ca4492f..e412ed067c 100644
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.sbin/k5stash/Makefile,v 1.4.2.3 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.sbin/k5stash/Attic/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.sbin/k5stash/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		k5stash
 SRCS=		kstash.c hdb_err.h
@@ -12,10 +12,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${HDBOBJDIR} -lhdb \
 		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index 461302ec79..76d8f1a0a2 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.3.2.4 2002/07/25 09:33:16 ru Exp $
-# $DragonFly: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.2 2003/06/17 04:26:18 dillon Exp $
+# $DragonFly: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PROG=		ktutil
 SRCS=		\
@@ -26,10 +26,6 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/admin \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
diff --git a/lib/Makefile b/lib/Makefile
index ce1791e8d0..eff06d1c72 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/lib/Makefile,v 1.107.2.16 2002/10/10 19:24:35 kbyanc Exp $
-# $DragonFly: src/lib/Makefile,v 1.3 2003/08/03 16:45:15 dillon Exp $
+# $DragonFly: src/lib/Makefile,v 1.4 2003/08/05 07:45:41 asmodai Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -65,8 +65,7 @@ _compat=	compat
 .endif
 
 .if defined(RELEASEDIR) || \
-    (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
-    defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
+    !exists(${.CURDIR}/../secure) || defined(NOCRYPT)
 _libtelnet=	libtelnet
 .endif
 
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index f7ba490b48..f8abe868a0 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -23,7 +23,7 @@
 # SUCH DAMAGE.
 #
 #	$FreeBSD: src/lib/libpam/libpam/Makefile,v 1.12.2.12 2002/07/22 14:21:49 ru Exp $
-#	$DragonFly: src/lib/libpam/libpam/Attic/Makefile,v 1.2 2003/06/17 04:26:50 dillon Exp $
+#	$DragonFly: src/lib/libpam/libpam/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 PAMDIR=		${.CURDIR}/../../../contrib/libpam
 MODOBJDIR=	../modules
@@ -65,9 +65,6 @@ MLINKS+=	pam_set_item.3 pam_get_item.3
 # Static PAM modules:
 STATIC_MODULES+= ${MODOBJDIR}/pam_cleartext_pass_ok/libpam_cleartext_pass_ok.a
 STATIC_MODULES+= ${MODOBJDIR}/pam_deny/libpam_deny.a
-.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
-STATIC_MODULES+= ${MODOBJDIR}/pam_kerberosIV/libpam_kerberosIV.a
-.endif
 .if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 STATIC_MODULES+= ${MODOBJDIR}/pam_kerberos5/libpam_kerberos5.a
 .endif
diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile
index cc378fe1a2..4b651903d5 100644
--- a/lib/libpam/modules/Makefile
+++ b/lib/libpam/modules/Makefile
@@ -23,13 +23,10 @@
 # SUCH DAMAGE.
 #
 #	$FreeBSD: src/lib/libpam/modules/Makefile,v 1.8.2.8 2002/07/03 21:35:18 des Exp $
-#	$DragonFly: src/lib/libpam/modules/Attic/Makefile,v 1.2 2003/06/17 04:26:50 dillon Exp $
+#	$DragonFly: src/lib/libpam/modules/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 
 SUBDIR+=	pam_cleartext_pass_ok
 SUBDIR+=	pam_deny
-.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
-SUBDIR+=	pam_kerberosIV
-.endif
 .if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=	pam_krb5
 .endif
diff --git a/libexec/Makefile b/libexec/Makefile
index 530998e6e8..9a843cefc3 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/libexec/Makefile,v 1.42.2.5 2002/11/12 17:32:48 obrien Exp $
-# $DragonFly: src/libexec/Makefile,v 1.4 2003/08/03 16:45:15 dillon Exp $
+# $DragonFly: src/libexec/Makefile,v 1.5 2003/08/05 07:45:41 asmodai Exp $
 
 # Present but disabled: kpasswdd
 SUBDIR=	atrun \
@@ -46,8 +46,7 @@ SUBDIR+=rtld-elf
 .endif
 
 .if defined(RELEASEDIR) || \
-    (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
-    defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
+    !exists(${.CURDIR}/../secure) || defined(NOCRYPT)
 # make release needs both
 SUBDIR+=telnetd
 .endif
diff --git a/release/Makefile b/release/Makefile
index b29287df38..3563b9b049 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/release/Makefile,v 1.536.2.110 2003/05/10 23:01:29 murray Exp $
-# $DragonFly: src/release/Attic/Makefile,v 1.2 2003/06/17 04:27:17 dillon Exp $
+# $DragonFly: src/release/Attic/Makefile,v 1.3 2003/08/05 07:45:41 asmodai Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \
 #	[ RELEASETAG=tag ]
@@ -200,9 +200,6 @@ BIGBOOTLABEL=		minimum2
 ZIPNSPLIT=		gzip --no-name -9 -c | split -b 240640 -
 
 # Things that need to be recompiled with Kerberos support.
-.if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
-K4PROGS!=	cd ${.CURDIR}/../kerberosIV; ${MAKE} -V KPROGS
-.endif
 .if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
 K5PROGS!=	cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
 .endif
@@ -458,12 +455,6 @@ release.3:
 	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
 	    SUBDIR_OVERRIDE="${FIXCRYPTO}" \
 	    buildworld distributeworld DISTDIR=${RD}/trees
-.if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
-	cd ${.CURDIR}/..; \
-	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS4 \
-	    SUBDIR_OVERRIDE="kerberosIV ${K4PROGS}" \
-	    buildworld distributeworld DISTDIR=${RD}/trees
-.endif
 .if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
 	cd ${.CURDIR}/..; \
 	${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS5 \
@@ -570,7 +561,6 @@ release.8:
 			cd ${.CURDIR} && $(MAKE) doTARBALL \
 				TN=`echo s$$i | tr -d '.' | \
 				    sed -e 's/usr/u/' \
-					-e 's/kerberosIV/krb4/' \
 					-e 's/kerberos5/krb5/'` \
 				SD=/usr/src TD=src ARG="$$i" ; \
 		fi ; \
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
index c30b4dce0d..8602c8f1d8 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD: src/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.1.2.2 2002/12/07 23:02:13 ue Exp $
-  $DragonFly: src/release/doc/de_DE.ISO8859-1/installation/common/Attic/upgrade.sgml,v 1.2 2003/06/17 04:27:19 dillon Exp $
+  $DragonFly: src/release/doc/de_DE.ISO8859-1/installation/common/Attic/upgrade.sgml,v 1.3 2003/08/05 07:45:41 asmodai Exp $
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.2.2.3 2002/12/07 20:28:56 ue Exp $
   $Id: upgrade.sgml,v 1.3 2002/03/10 15:37:18 ue Exp $
   basiert auf: 1.1.2.7
@@ -82,7 +82,6 @@
         <filename>hosts.equiv</filename>,
         <filename>hosts.lpd</filename>,
         <filename>inetd.conf</filename>,
-        <filename>kerberosIV</filename>,
         <filename>localtime</filename>,
         <filename>login.access</filename>,
         <filename>login.conf</filename>, <filename>mail</filename>,
diff --git a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
index 8f9a92759d..bf38b5ce02 100644
--- a/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml,v 1.1.2.7 2001/12/27 20:01:13 bmah Exp $
-	$DragonFly: src/release/doc/en_US.ISO8859-1/installation/common/Attic/upgrade.sgml,v 1.2 2003/06/17 04:27:19 dillon Exp $
+	$DragonFly: src/release/doc/en_US.ISO8859-1/installation/common/Attic/upgrade.sgml,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 	This section contains the contents of the old UPGRADE.TXT
 	file.
@@ -82,7 +82,6 @@
 <filename>hosts.equiv</filename>,
 <filename>hosts.lpd</filename>,
 <filename>inetd.conf</filename>,
-<filename>kerberosIV</filename>,
 <filename>localtime</filename>,
 <filename>login.access</filename>,
 <filename>login.conf</filename>,
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
index a55d026348..d9c54d7d8d 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
@@ -4,7 +4,7 @@
 
      $Id$
      $FreeBSD: src/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml,v 1.1.2.1 2002/02/26 13:51:21 gioria Exp $
-     $DragonFly: src/release/doc/fr_FR.ISO8859-1/installation/common/Attic/upgrade.sgml,v 1.2 2003/06/17 04:27:19 dillon Exp $
+     $DragonFly: src/release/doc/fr_FR.ISO8859-1/installation/common/Attic/upgrade.sgml,v 1.3 2003/08/05 07:45:42 asmodai Exp $
      Original revision: 1.7
      This section contains the contents of the old UPGRADE.TXT
      file.
@@ -85,7 +85,6 @@
 <filename>hosts.equiv</filename>,
 <filename>hosts.lpd</filename>,
 <filename>inetd.conf</filename>,
-<filename>kerberosIV</filename>,
 <filename>localtime</filename>,
 <filename>login.access</filename>,
 <filename>login.conf</filename>,
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index d6452983ba..0b9076df2d 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -5,7 +5,7 @@
  * generation being essentially a complete rewrite.
  *
  * $FreeBSD: src/release/sysinstall/dist.c,v 1.175.2.31 2003/03/03 09:31:42 murray Exp $
- * $DragonFly: src/release/sysinstall/Attic/dist.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/sysinstall/Attic/dist.c,v 1.3 2003/08/05 07:45:42 asmodai Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -91,11 +91,9 @@ static Distribution DistTable[] = {
 /* The CRYPTO distribution */
 static Distribution CRYPTODistTable[] = {
 { "crypto",     "/",                    &CRYPTODists,	DIST_CRYPTO_CRYPTO,		NULL		},
-{ "krb4",	"/",			&CRYPTODists,	DIST_CRYPTO_KERBEROS4,	NULL		},
 { "krb5",	"/",			&CRYPTODists,	DIST_CRYPTO_KERBEROS5,	NULL		},
 { "ssecure",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SSECURE,	NULL		},
 { "scrypto",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SCRYPTO,	NULL		},
-{ "skrb4",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SKERBEROS4,	NULL		},
 { "skrb5",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SKERBEROS5,	NULL		},
 { NULL },
 };
@@ -207,7 +205,7 @@ distVerifyFlags(void)
     if (SrcDists)
 	Dists |= DIST_SRC;
     if (CRYPTODists) {
-	if (CRYPTODists & (DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5))
+	if (CRYPTODists & DIST_CRYPTO_KERBEROS5)
 	    CRYPTODists |= DIST_CRYPTO_CRYPTO;
 	Dists |= DIST_CRYPTO;
     }
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index e5b128ca9f..883923c0da 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/release/sysinstall/dist.h,v 1.48.2.3 2001/03/22 01:43:46 ps Exp $  */
-/* $DragonFly: src/release/sysinstall/Attic/dist.h,v 1.2 2003/06/17 04:27:21 dillon Exp $  */
+/* $DragonFly: src/release/sysinstall/Attic/dist.h,v 1.3 2003/08/05 07:45:42 asmodai Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
@@ -32,12 +32,7 @@
 #define DIST_CRYPTO_CRYPTO	0x0001
 #define DIST_CRYPTO_SCRYPTO	0x0002
 #define DIST_CRYPTO_SSECURE	0x0004
-#if __FreeBSD__ <= 3
-#define DIST_CRYPTO_KERBEROS	0x0008
-#else
-#define DIST_CRYPTO_KERBEROS4	0x0008
 #define DIST_CRYPTO_KERBEROS5	0x0010
-#define DIST_CRYPTO_SKERBEROS4	0x0020
 #define DIST_CRYPTO_SKERBEROS5	0x0040
 #endif
 #define DIST_CRYPTO_ALL		0x007F
@@ -127,7 +122,7 @@
 	( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
 
 #define DIST_CRYPTO_BIN \
-	( DIST_CRYPTO_CRYPTO | DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5 )
+	( DIST_CRYPTO_CRYPTO | DIST_CRYPTO_KERBEROS5 )
 
 #endif	/* _DIST_H_INCLUDE */
 
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index fb64ded498..59e7713d19 100644
--- a/release/sysinstall/installUpgrade.c
+++ b/release/sysinstall/installUpgrade.c
@@ -5,7 +5,7 @@
  * generation being essentially a complete rewrite.
  *
  * $FreeBSD: src/release/sysinstall/installUpgrade.c,v 1.71.2.12 2002/06/10 04:28:53 obrien Exp $
- * $DragonFly: src/release/sysinstall/Attic/installUpgrade.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/sysinstall/Attic/installUpgrade.c,v 1.3 2003/08/05 07:45:42 asmodai Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -86,7 +86,6 @@ static HitList etc_files [] = {
    { JUST_COPY,		"hosts.equiv",		TRUE, NULL },
    { JUST_COPY,		"hosts.lpd",		TRUE, NULL },
    { JUST_COPY,		"inetd.conf",		TRUE, NULL },
-   { JUST_COPY,		"kerberosIV",		TRUE, NULL },
    { JUST_COPY,		"localtime",		TRUE, NULL },
    { JUST_COPY,		"login.access",		TRUE, NULL },
    { JUST_COPY,		"login.conf",		TRUE, NULL },
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index bd2c00fe8a..19115e7c5e 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/release/sysinstall/menus.c,v 1.252.2.67 2003/05/15 02:05:31 murray Exp $
- * $DragonFly: src/release/sysinstall/Attic/menus.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/sysinstall/Attic/menus.c,v 1.3 2003/08/05 07:45:42 asmodai Exp $
  */
 
 #include "sysinstall.h"
@@ -43,7 +43,7 @@ setSrc(dialogMenuItem *self)
     Dists |= DIST_SRC;
     SrcDists = DIST_SRC_ALL;
     CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
-	DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
+	DIST_CRYPTO_SKERBEROS5);
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -53,7 +53,7 @@ clearSrc(dialogMenuItem *self)
     Dists &= ~DIST_SRC;
     SrcDists = 0;
     CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
-	DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5);
+	DIST_CRYPTO_SKERBEROS5);
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -815,15 +815,8 @@ DMenu MenuSubDistributions = {
 #endif
       { " crypto",	"Basic encryption services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
-#if __FreeBSD__ <= 3
-      { " krb",		"KerberosIV authentication services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS },
-#else
-      { " krb4",	"KerberosIV authentication services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 },
       { " krb5",	"Kerberos5 authentication services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
-#endif
       { " dict",	"Spelling checker dictionary files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
       { " doc",		"Miscellaneous FreeBSD online docs",
@@ -892,8 +885,6 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO },
       { " share",	"/usr/src/share (documents and shared files)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
-      { " skrb4",	"/usr/src/kerberosIV (sources for KerberosIV)",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS4 },
       { " skrb5",	"/usr/src/kerberos5 (sources for Kerberos5)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
       { " ssecure",	"/usr/src/secure (BSD encryption sources)",
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 12fa875b4c..daff5849d7 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD: src/sbin/dump/Makefile,v 1.12.2.4 2003/01/25 18:54:59 dillon Exp $
-# $DragonFly: src/sbin/dump/Makefile,v 1.2 2003/06/17 04:27:32 dillon Exp $
+# $DragonFly: src/sbin/dump/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
@@ -22,17 +22,4 @@ SRCS=	itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c
 MAN=	dump.8
 MLINKS+=dump.8 rdump.8
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-.PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD=	${LIBKRB} ${LIBCRYPTO}
-LDADD+=	-lkrb -lcrypto
-CFLAGS+=-DKERBEROS -DHAVE_CONFIG_H \
-	-I${.CURDIR}/../../kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-DISTRIBUTION=	krb4
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 070de297b6..ad5eccc57a 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_nfs.c	8.11 (Berkeley) 5/4/95
  * $FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.36.2.6 2003/05/13 14:45:40 trhodes Exp $
- * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.3 2003/08/05 07:45:42 asmodai Exp $
  */
 
 #include <sys/param.h>
@@ -48,11 +48,6 @@
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_prot.h>
 
-#ifdef NFSKERB
-#include <kerberosIV/des.h>
-#include <kerberosIV/krb.h>
-#endif
-
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index 9e15a1be03..f609106c22 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -1,16 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD: src/sbin/nfsd/Makefile,v 1.10.2.2 2001/04/25 10:58:42 ru Exp $
-# $DragonFly: src/sbin/nfsd/Makefile,v 1.2 2003/06/17 04:27:34 dillon Exp $
+# $DragonFly: src/sbin/nfsd/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 PROG=	nfsd
 CFLAGS+=-DNFS
 MAN=	nfsd.8
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
-CFLAGS+=-DKERBEROS
-DPADD+=	${LIBKRB} ${LIBCRYPTO}
-LDADD+=	-lkrb -lcrypto
-DISTRIBUTION=	krb4
-.endif
-
 .include <bsd.prog.mk>
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index 9dafbefa2a..1b2c79dd4b 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1989, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)nfsd.c	8.9 (Berkeley) 3/29/95
  * $FreeBSD: src/sbin/nfsd/nfsd.c,v 1.15.2.1 2000/09/16 22:52:23 brian Exp $
- * $DragonFly: src/sbin/nfsd/nfsd.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/nfsd/nfsd.c,v 1.3 2003/08/05 07:45:42 asmodai Exp $
  */
 
 #include <sys/param.h>
@@ -56,11 +56,6 @@
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 
-#ifdef NFSKERB
-#include <kerberosIV/des.h>
-#include <kerberosIV/krb.h>
-#endif
-
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index ab697b5e77..cd9718b7d2 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD: src/sbin/restore/Makefile,v 1.13.2.3 2002/07/17 19:08:22 ru Exp $
-# $DragonFly: src/sbin/restore/Makefile,v 1.2 2003/06/17 04:27:34 dillon Exp $
+# $DragonFly: src/sbin/restore/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
@@ -12,17 +12,4 @@ MAN=	restore.8
 MLINKS+=restore.8 rrestore.8
 .PATH:	${.CURDIR}/../dump
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-.PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD+=	${LIBKRB} ${LIBCRYPTO}
-LDADD+=	-lkrb -lcrypto
-CFLAGS+=-DKERBEROS -DHAVE_CONFIG_H \
-	-I${.CURDIR}/../../kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-DISTRIBUTION=	krb4
-.endif
-
 .include <bsd.prog.mk>
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index 1c9385fa0c..8fe558eb66 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD: src/secure/lib/Makefile,v 1.19.2.5 2003/04/04 21:33:15 ru Exp $
-# $DragonFly: src/secure/lib/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/lib/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 SUBDIR= libcipher
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
 SUBDIR+=libtelnet
 .endif
 .if !defined(NO_OPENSSL)
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index e207e368ed..d5c139414b 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/secure/lib/libssh/Makefile,v 1.2.2.7 2003/02/03 17:31:12 des Exp $
-# $DragonFly: src/secure/lib/libssh/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/lib/libssh/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
 LIB=	ssh
 SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
@@ -19,9 +19,6 @@ SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
 .endif
 
 CFLAGS+= -I${SSHDIR}
-.if defined(MAKE_KERBEROS4)
-CFLAGS+= -DKRB4
-.endif
 .if defined(MAKE_KERBEROS5)
 CFLAGS+= -DKRB5 -DHEIMDAL
 .endif
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 0ad1d1e5ac..cf90d806f0 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/secure/libexec/Makefile,v 1.4.2.6 2002/07/05 11:10:51 des Exp $
-# $DragonFly: src/secure/libexec/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/libexec/Makefile,v 1.3 2003/08/05 07:45:42 asmodai Exp $
 
-.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL)
 SUBDIR= telnetd
 .endif
 .if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 751379e961..66c5683c51 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD: src/secure/usr.bin/Makefile,v 1.14.2.4 2002/07/05 11:11:01 des Exp $
-# $DragonFly: src/secure/usr.bin/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/usr.bin/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 
 SUBDIR= bdes
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS5)
 SUBDIR+=telnet
 .endif
 .if !defined(NO_OPENSSL)
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index c5debe0d50..b53a78d299 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.4.2.8 2003/02/03 17:31:12 des Exp $
-# $DragonFly: src/secure/usr.bin/ssh/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/usr.bin/ssh/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 #
 
 PROG=	ssh
@@ -11,13 +11,6 @@ MLINKS=	ssh.1 slogin.1
 SRCS=	ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
 	sshconnect.c sshconnect1.c sshconnect2.c
 
-.if defined(MAKE_KERBEROS4)
-DISTRIBUTION=krb4
-CFLAGS+= -DKRB4
-LDADD+=	 -lkrb -lcom_err
-DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
-.endif
-
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 3b9dccbb9f..8066319a36 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.5.2.9 2003/02/03 17:31:12 des Exp $
-# $DragonFly: src/secure/usr.sbin/sshd/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/usr.sbin/sshd/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 #
 
 PROG=	sshd
@@ -16,14 +16,6 @@ SRCS+=	loginrec.c
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}
 
-.if defined(MAKE_KERBEROS4)
-DISTRIBUTION=krb4
-CFLAGS+= -DKRB4
-SRCS+=	auth-krb4.c
-LDADD+=	 -lkrb -lcom_err
-DPADD+=	 ${LIBKRB} ${LIBCOM_ERR}
-.endif
-
 .if defined(MAKE_KERBEROS5)
 DISTRIBUTION=krb5
 CFLAGS+= -DKRB5 -DHEIMDAL
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 1d04d3c827..1f61b071a8 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.26.2.10 2003/03/05 23:03:06 peter Exp $
-# $DragonFly: src/share/examples/cvsup/Attic/cvs-supfile,v 1.2 2003/06/17 04:36:57 dillon Exp $
+# $DragonFly: src/share/examples/cvsup/Attic/cvs-supfile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # CVS development tree of the FreeBSD system.
@@ -75,7 +75,6 @@ src-all
 #src-gnu
 #src-include
 #src-kerberos5
-#src-kerberosIV
 #src-lib
 #src-libexec
 #src-release
@@ -89,7 +88,6 @@ src-all
 # collection. They are no longer export-restricted and are a part of
 # src-all
 #src-crypto
-#src-eBones
 #src-secure
 #src-sys-crypto
 
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 163691a6b4..ea223c2eaf 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.19.2.6 2002/08/06 08:24:46 blackend Exp $
-# $DragonFly: src/share/examples/cvsup/Attic/stable-supfile,v 1.2 2003/06/17 04:36:57 dillon Exp $
+# $DragonFly: src/share/examples/cvsup/Attic/stable-supfile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-stable source tree.
@@ -94,7 +94,6 @@ src-all
 #src-gnu
 #src-include
 #src-kerberos5
-#src-kerberosIV
 #src-lib
 #src-libexec
 #src-release
@@ -108,6 +107,5 @@ src-all
 # collection. They are no longer export-restricted and are a part of
 # src-all
 #src-crypto
-#src-eBones
 #src-secure
 #src-sys-crypto
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index 665fd6412d..9f58338b49 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.17.2.6 2002/08/06 08:24:46 blackend Exp $
-# $DragonFly: src/share/examples/cvsup/Attic/standard-supfile,v 1.2 2003/06/17 04:36:57 dillon Exp $
+# $DragonFly: src/share/examples/cvsup/Attic/standard-supfile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-stable source tree.
@@ -74,7 +74,6 @@ src-all
 #src-gnu
 #src-include
 #src-kerberos5
-#src-kerberosIV
 #src-lib
 #src-libexec
 #src-release
@@ -88,6 +87,5 @@ src-all
 # collection. They are no longer export-restricted and are a part of
 # src-all
 #src-crypto
-#src-eBones
 #src-secure
 #src-sys-crypto
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index f94c32a896..7db2675fe4 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
-.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.4 2003/08/03 16:45:15 dillon Exp $
+.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.5 2003/08/05 07:45:43 asmodai Exp $
 .\"
 .Dd November 3, 2000
 .Dt MAKE.CONF 5
@@ -415,9 +415,6 @@ This code is patented in the USA and many European countries.
 It is
 .Em "YOUR RESPONSIBILITY"
 to determine if you can legally use IDEA.
-.It Va MAKE_KERBEROS4
-.Pq Vt bool
-Set this to build KerberosIV (KTH eBones).
 .It Va MAKE_KERBEROS5
 .Pq Vt bool
 Set this to build Kerberos5 (KTH Heimdal).
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 392f7c1031..f569d79fe6 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $
-.\" $DragonFly: src/share/man/man7/hier.7,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man7/hier.7,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -83,10 +83,6 @@ see
 isdn4bsd configuration files;
 see
 .Xr isdnd 8
-.It Pa kerberosIV/
-configuration files for kerberos version IV;
-see
-.Xr kerberos 1
 .It Pa localtime
 local timezone information;
 see
@@ -152,12 +148,12 @@ useful and semi-frivolous programs
 .It Pa include/
 standard C include files
 .Pp
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa arpa/
 C include files for Internet service protocols
 .It Pa cam/
 C include files for the Common Access Methods Layer
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa scsi/
 The SCSI device on top of CAM
 .El
@@ -165,7 +161,7 @@ The SCSI device on top of CAM
 C include files for programming various
 .Fx
 devices
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa ppbus/
 The parallel port bus;
 see
@@ -174,27 +170,23 @@ see
 The USB subsystem
 .El
 .It Pa fs/
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa smbfs/
 SMB/CIFS filesystem
 .El
 .It Pa g++/
 GNU C++ include files
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa std/
 GNU C++ libstdc++ include files
 .El
 .It Pa isc/
 ISC utility library libisc include files
 .It Pa isofs/
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa cd9660/
 iso9660 filesystem
 .El
-.It Pa kerberosIV/
-C include files for kerberos authentication package;
-see
-.Xr kerberos 1
 .It Pa libmilter/
 C include files for libmilter,
 the sendmail mail filter API
@@ -268,7 +260,7 @@ system C include files (kernel data structures)
 .\" Tcl language;
 .\" see
 .\" .Xr Tcl n
-.\" .Bl -tag -width "kerberosIV/" -compact
+.\" .Bl -tag -width "cd9660/" -compact
 .\" .It Pa generic/
 .\" ???
 .\" .It Pa unix/
@@ -276,7 +268,7 @@ system C include files (kernel data structures)
 .\" .El
 .It Pa ufs/
 C include files for UFS (The U-word File System)
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "cd9660/" -compact
 .It Pa ffs/
 Fast filesystem
 .It Pa mfs/
@@ -555,7 +547,7 @@ see
 .Bx ,
 third-party, and/or local source files
 .Pp
-.Bl -tag -width "kerberosIV/" -compact
+.Bl -tag -width "contrib/" -compact
 .It Pa bin/
 source code for files in /bin
 .It Pa contrib/
@@ -570,7 +562,7 @@ source code for files in /usr/games
 Utilities covered by the GNU General Public License
 .It Pa include/
 source code for files in /usr/include
-.It Pa kerberosIV/
+.It Pa contrib/
 source code for kerberos version IV
 .It Pa lib/
 source code for files in /usr/lib
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 490994f550..dbc43001bc 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.28.2.10 2002/08/08 09:33:28 ru Exp $
-# $DragonFly: src/share/mk/bsd.libnames.mk,v 1.2 2003/06/17 04:37:02 dillon Exp $
+# $DragonFly: src/share/mk/bsd.libnames.mk,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 #
 # The include file <bsd.libnames.mk> define library names. 
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this 
@@ -75,10 +75,6 @@ LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
 MINUSLPAM?=	-lpam
 .if defined(NOSHARED) && ${NOSHARED} != "no" && ${NOSHARED} != "NO"
-.ifdef MAKE_KERBEROS4
-LIBPAM+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
-MINUSLPAM+=	-lkrb -lcrypto -lcom_err
-.endif
 LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBSKEY} ${LIBCRYPT} ${LIBMD} \
 		${LIBUTIL}
 MINUSLPAM+=	-lradius -ltacplus -lskey -lcrypt -lmd -lutil
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index be92e687d1..cc96ba66b2 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/tools/make_libdeps.sh,v 1.2.2.1 2002/07/23 12:12:30 ru Exp $
-# $DragonFly: src/tools/make_libdeps.sh,v 1.2 2003/06/17 04:29:08 dillon Exp $
+# $DragonFly: src/tools/make_libdeps.sh,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 
 export PATH=/usr/bin
 
@@ -36,7 +36,6 @@ LIBS="
 	lib
 	gnu/lib
 	gnu/usr.bin/perl/libperl
-	kerberosIV/lib
 	kerberos5/lib
 	secure/lib
 	usr.bin/lex/lib
@@ -50,7 +49,6 @@ sed -E
     -e's; ;! ;g'
     -e's;$;!;'
     -e's;-lm!;lib/msun;g'
-    -e's;-l(krb)!;kerberosIV/lib/lib\1;g'
     -e's;-l(asn1|gssapi|krb5|roken)!;kerberos5/lib/lib\1;g'
     -e's;-l(crypto|ssh)!;secure/lib/lib\1;g'
     -e's;-l([^!]+)!;lib/lib\1;g'
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ae3e95d337..05db53e303 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,6 +1,6 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
 # $FreeBSD: src/usr.bin/Makefile,v 1.144.2.17 2003/01/04 17:17:07 obrien Exp $
-# $DragonFly: src/usr.bin/Makefile,v 1.4 2003/08/03 16:45:16 dillon Exp $
+# $DragonFly: src/usr.bin/Makefile,v 1.5 2003/08/05 07:45:43 asmodai Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
@@ -207,8 +207,7 @@ SUBDIR=	alias \
 	ypwhich
 
 .if defined(RELEASEDIR) || \
-    (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \
-    defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
+    !exists(${.CURDIR}/../secure) || defined(NOCRYPT)
 # Releases need both this non-crypt telnet and the crypt telnet.
 SUBDIR+=telnet
 .endif
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 1da7dd052e..8c48ace44f 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,6 +1,6 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 # $FreeBSD: src/usr.bin/passwd/Makefile,v 1.40.2.3 2002/07/17 19:08:22 ru Exp $
-# $DragonFly: src/usr.bin/passwd/Makefile,v 1.2 2003/06/17 04:29:30 dillon Exp $
+# $DragonFly: src/usr.bin/passwd/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 
 # NOPAM is used by PicoBSD
 
@@ -83,19 +83,6 @@ BINMODE=4555
 LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS=passwd.1 yppasswd.1
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-SRCS+=	kpasswd_standalone.c
-.PATH:	${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-	${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \
-	${.CURDIR}/../../crypto/kerberosIV/kadmin
-
-CFLAGS+=	-DKERBEROS
-# XXX not defined: ${LIBKADM}, ${LIBCOM_ERR}
-DPADD=	${LIBKADM} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
-LDADD=	-lkadm -lkrb -lcrypto -lcrypt -lrpcsvc -lcom_err -lutil
-DISTRIBUTION=	krb4
-.endif
-
 beforeinstall:
 .for i in passwd yppasswd
 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index ba1eaaf70f..be5c50abcc 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD: src/usr.bin/rlogin/Makefile,v 1.21.2.2 2002/07/19 18:03:41 ru Exp $
-# $DragonFly: src/usr.bin/rlogin/Makefile,v 1.2 2003/06/17 04:29:30 dillon Exp $
+# $DragonFly: src/usr.bin/rlogin/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 
 PROG=	rlogin
 SRCS=	rlogin.c
@@ -9,17 +9,4 @@ CFLAGS+=-Wall
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-	-I${.CURDIR}/../../kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-LDADD=	-lutil -lkrb -lcrypto -lcrypt -lcom_err
-DISTRIBUTION=	krb4
-.PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-.endif
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 872da492d0..5c7865667d 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,26 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD: src/usr.bin/rsh/Makefile,v 1.17.2.1 2002/07/17 19:08:22 ru Exp $
-# $DragonFly: src/usr.bin/rsh/Makefile,v 1.2 2003/06/17 04:29:31 dillon Exp $
+# $DragonFly: src/usr.bin/rsh/Makefile,v 1.3 2003/08/05 07:45:43 asmodai Exp $
 
 PROG=	rsh
 SRCS=	rsh.c
 CFLAGS+=-Wall
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-SRCS+=	krcmd.c kcmd.c rcmd_util.c
-CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
-	-I${.CURDIR}/../rlogin -I${.CURDIR} -I- \
-	-I${.CURDIR}/../../kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/include \
-	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
-	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lutil -lkrb -lcrypto -lcrypt -lcom_err
-DISTRIBUTION=	krb4
-.PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-.endif
-
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index a8967e1ae3..24ad70b288 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD: src/usr.bin/su/Makefile,v 1.29.2.2 2002/07/17 19:08:23 ru Exp $
-# $DragonFly: src/usr.bin/su/Makefile,v 1.2 2003/06/17 04:29:32 dillon Exp $
+# $DragonFly: src/usr.bin/su/Makefile,v 1.3 2003/08/05 07:45:44 asmodai Exp $
 
 PROG=	su
 SRCS=	su.c
@@ -14,13 +14,6 @@ COPTS+=	-DWHEELSU
 .endif
 CFLAGS+= -Wall
 
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-CFLAGS+=-DKERBEROS4
-DPADD+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb -lcrypto -lcom_err
-DISTRIBUTION=	krb4
-.endif
-
 .if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
 CFLAGS+=-DKERBEROS5
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 75bee69036..2c532712a3 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1988, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)su.c	8.3 (Berkeley) 4/2/94
  * $FreeBSD: src/usr.bin/su/su.c,v 1.34.2.4 2002/06/16 21:04:15 nectar Exp $
- * $DragonFly: src/usr.bin/su/su.c,v 1.2 2003/06/17 04:29:32 dillon Exp $
+ * $DragonFly: src/usr.bin/su/su.c,v 1.3 2003/08/05 07:45:44 asmodai Exp $
  */
 
 #include <sys/param.h>
@@ -73,24 +73,12 @@ static long kerberos5(krb5_context context, const char *current_user,
 int use_kerberos5 = 1;
 #endif
 
-#ifdef KERBEROS4
-#include <openssl/des.h>
-#include <krb.h>
-#include <netdb.h>
-
-
-static int kerberos4(char *username, char *user, int uid, char *pword);
-static int koktologin(char *name, char *toname);
-
-int use_kerberos4 = 1;
-#endif /* KERBEROS4 */
-
 #ifdef LOGIN_CAP
 #define LOGIN_CAP_ARG(x) x
 #else
 #define LOGIN_CAP_ARG(x)
 #endif
-#if defined(KERBEROS4) || defined(KERBEROS5)
+#if defined(KERBEROS5)
 #define KERBEROS_ARG(x) x
 #else
 #define KERBEROS_ARG(x)
@@ -124,7 +112,7 @@ main(argc, argv)
 	char *class=NULL;
 	int setwhat;
 #endif
-#if defined(KERBEROS4) || defined(KERBEROS5)
+#if defined(KERBEROS5)
 	char *k;
 #endif
 #ifdef KERBEROS5
@@ -141,14 +129,9 @@ main(argc, argv)
 	user = "root";
 	while((ch = getopt(argc, argv, ARGSTR)) != -1) 
 		switch((char)ch) {
-#if defined(KERBEROS4) || defined(KERBEROS5)
+#if defined(KERBEROS5)
 		case 'K':
-#ifdef KERBEROS4
-			use_kerberos4 = 0;
-#endif
-#ifdef KERBEROS5
 			use_kerberos5 = 0;
-#endif
 			break;
 #endif
 		case 'f':
@@ -195,18 +178,11 @@ main(argc, argv)
 
 	argv += optind;
 
-#if defined(KERBEROS4) || defined(KERBEROS5)
+#if defined(KERBEROS5)
 	k = auth_getval("auth_list");
 	if (k && !strstr(k, "kerberos")) {
-#ifdef KERBEROS4
-	    use_kerberos4 = 0;
-#endif
-#ifdef KERBEROS5
 	    use_kerberos5 = 0;
-#endif
 	}
-#endif
-#ifdef KERBEROS5
 	su_principal_name = NULL;
 	su_principal = NULL;
 	if (krb5_init_context(&context) != 0)
@@ -263,13 +239,6 @@ main(argc, argv)
 #endif /* WHEELSU */
 
 	if (ruid) {
-#ifdef KERBEROS4
-		if (use_kerberos4 && koktologin(username, user)
-		    && !pwd->pw_uid) {
-			warnx("kerberos4: not in %s's ACL.", user);
-			use_kerberos4 = 0;
-		}
-#endif
 #ifdef KERBEROS5
 		if (use_kerberos5) {
 			if (get_su_principal(context, user, username,
@@ -326,11 +295,6 @@ main(argc, argv)
 			p = getpass("Password:");
 			if (strcmp(pwd->pw_passwd, crypt(p, pwd->pw_passwd))) {
 #endif
-#ifdef KERBEROS4
-				if (use_kerberos4 && kerberos4(username, user,
-				    pwd->pw_uid, p) == 0)
-					goto authok;
-#endif
 #ifdef KERBEROS5
 				if (use_kerberos5 && kerberos5(context,
 				    username, user, su_principal, p) == 0)
@@ -342,7 +306,7 @@ main(argc, argv)
 				    ontty());
 				exit(1);
 			}
-#if defined(KERBEROS4) || defined(KERBEROS5)
+#if defined(KERBEROS5)
 		authok:
 #endif
 #ifdef WHEELSU
@@ -409,9 +373,6 @@ main(argc, argv)
 	if (!asme) {
 		if (asthem) {
 			p = getenv("TERM");
-#ifdef KERBEROS4
-			k = getenv("KRBTKFILE");
-#endif
 #ifdef KERBEROS5
 			ccname = getenv("KRB5CCNAME");
 #endif
@@ -427,10 +388,6 @@ main(argc, argv)
 #endif
 			if (p)
 				(void)setenv("TERM", p, 1);
-#ifdef KERBEROS4
-			if (k)
-				(void)setenv("KRBTKFILE", k, 1);
-#endif
 #ifdef KERBEROS5
 			if (ccname)
 				(void)setenv("KRB5CCNAME", ccname, 1);
@@ -655,136 +612,3 @@ get_su_principal(krb5_context context, const char *target_user,
 }
 
 #endif
-
-#ifdef KERBEROS4
-int
-kerberos4(username, user, uid, pword)
-	char *username, *user;
-	int uid;
-	char *pword;
-{
-	KTEXT_ST ticket;
-	AUTH_DAT authdata;
-	int kerno;
-	u_long faddr;
-	char lrealm[REALM_SZ], krbtkfile[MAXPATHLEN];
-	char hostname[MAXHOSTNAMELEN], savehost[MAXHOSTNAMELEN];
-	char *krb_get_phost();
-	struct hostent *hp;
-
-	if (krb_get_lrealm(lrealm, 1) != KSUCCESS)
-		return (1);
-	(void)sprintf(krbtkfile, "%s_%s_%lu", TKT_ROOT, user,
-	    (unsigned long)getuid());
-
-	(void)setenv("KRBTKFILE", krbtkfile, 1);
-	(void)krb_set_tkt_string(krbtkfile);
-	/*
-	 * Set real as well as effective ID to 0 for the moment,
-	 * to make the kerberos library do the right thing.
-	 */
-	if (setuid(0) < 0) {
-		warn("setuid");
-		return (1);
-	}
-
-	/*
-	 * Little trick here -- if we are su'ing to root,
-	 * we need to get a ticket for "xxx.root", where xxx represents
-	 * the name of the person su'ing.  Otherwise (non-root case),
-	 * we need to get a ticket for "yyy.", where yyy represents
-	 * the name of the person being su'd to, and the instance is null
-	 *
-	 * We should have a way to set the ticket lifetime,
-	 * with a system default for root.
-	 */
-	kerno = krb_get_pw_in_tkt((uid == 0 ? username : user),
-		(uid == 0 ? "root" : ""), lrealm,
-	    	"krbtgt", lrealm, DEFAULT_TKT_LIFE, pword);
-
-	if (kerno != KSUCCESS) {
-		if (kerno == KDC_PR_UNKNOWN) {
-			warnx("kerberos4: principal unknown: %s.%s@%s",
-				(uid == 0 ? username : user),
-				(uid == 0 ? "root" : ""), lrealm);
-			return (1);
-		}
-		warnx("kerberos4: unable to su: %s", krb_err_txt[kerno]);
-		syslog(LOG_NOTICE|LOG_AUTH,
-		    "BAD Kerberos4 SU: %s to %s%s: %s",
-		    username, user, ontty(), krb_err_txt[kerno]);
-		return (1);
-	}
-
-	if (chown(krbtkfile, uid, -1) < 0) {
-		warn("chown");
-		(void)unlink(krbtkfile);
-		return (1);
-	}
-
-	(void)setpriority(PRIO_PROCESS, 0, -2);
-
-	if (gethostname(hostname, sizeof(hostname)) == -1) {
-		warn("gethostname");
-		dest_tkt();
-		return (1);
-	}
-
-	(void)strncpy(savehost, krb_get_phost(hostname), sizeof(savehost));
-	savehost[sizeof(savehost) - 1] = '\0';
-
-	kerno = krb_mk_req(&ticket, "rcmd", savehost, lrealm, 33);
-
-	if (kerno == KDC_PR_UNKNOWN) {
-		warnx("Warning: TGT not verified.");
-		syslog(LOG_NOTICE|LOG_AUTH,
-		    "%s to %s%s, TGT not verified (%s); %s.%s not registered?",
-		    username, user, ontty(), krb_err_txt[kerno],
-		    "rcmd", savehost);
-	} else if (kerno != KSUCCESS) {
-		warnx("Unable to use TGT: %s", krb_err_txt[kerno]);
-		syslog(LOG_NOTICE|LOG_AUTH, "failed su: %s to %s%s: %s",
-		    username, user, ontty(), krb_err_txt[kerno]);
-		dest_tkt();
-		return (1);
-	} else {
-		if (!(hp = gethostbyname(hostname))) {
-			warnx("can't get addr of %s", hostname);
-			dest_tkt();
-			return (1);
-		}
-		memmove((char *)&faddr, (char *)hp->h_addr, sizeof(faddr));
-
-		if ((kerno = krb_rd_req(&ticket, "rcmd", savehost, faddr,
-		    &authdata, "")) != KSUCCESS) {
-			warnx("kerberos4: unable to verify rcmd ticket: %s\n",
-			    krb_err_txt[kerno]);
-			syslog(LOG_NOTICE|LOG_AUTH,
-			    "failed su: %s to %s%s: %s", username,
-			     user, ontty(), krb_err_txt[kerno]);
-			dest_tkt();
-			return (1);
-		}
-	}
-	return (0);
-}
-
-int
-koktologin(name, toname)
-	char *name, *toname;
-{
-	AUTH_DAT *kdata;
-	AUTH_DAT kdata_st;
-	char realm[REALM_SZ];
-
-	if (krb_get_lrealm(realm, 1) != KSUCCESS)
-		return (1);
-	kdata = &kdata_st;
-	memset((char *)kdata, 0, sizeof(*kdata));
-	(void)strncpy(kdata->pname, name, sizeof kdata->pname - 1);
-	(void)strncpy(kdata->pinst,
-	    ((strcmp(toname, "root") == 0) ? "root" : ""), sizeof kdata->pinst - 1);
-	(void)strncpy(kdata->prealm, realm, sizeof kdata->prealm - 1);
-	return (kuserok(kdata, toname));
-}
-#endif
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
index fbb5bf26ce..fffda755ef 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur
@@ -1,8 +1,9 @@
 #!/usr/local/bin/tclsh
+# $DragonFly: src/usr.sbin/ctm/mkCTM/Attic/ctm_conf.cvs-cur,v 1.2 2003/08/05 07:45:44 asmodai Exp $
 
 set CTMname	cvs-cur
 set CTMref	/home/ncvs
-set CTMignore	{^src/secure|^src/eBones|^src/kerberosIV|^CVSROOT/val-tags$|CVSROOT/\\.#}
+set CTMignore	{^src/secure|^CVSROOT/val-tags$|CVSROOT/\\.#}
 set CTMbogus	{\\.core$|/#cvs|/\\.#}
 set CTMmail	ctm-cvs-cur-fast@freebsd.org
 set CTMqueuemail	ctm-cvs-cur@freebsd.org
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
index 8589d040ef..af077daf74 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur
@@ -1,8 +1,9 @@
 #!/usr/local/bin/tclsh
+# $DragonFly: src/usr.sbin/ctm/mkCTM/Attic/ctm_conf.src-cur,v 1.2 2003/08/05 07:45:44 asmodai Exp $
 
 set CTMname	src-cur
 set CTMref	/c/src
-set CTMignore	{/CVS$|/CVS/|^/secure|^/eBones}
+set CTMignore	{/CVS$|/CVS/|^/secure}
 set CTMbogus	{\\.core$|/#cvs|/\\.#}
 set CTMmail	ctm-src-cur-fast@freebsd.org
 set CTMqueue	/home/ctm/queue/ctm-src-cur
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.src-special b/usr.sbin/ctm/mkCTM/ctm_conf.src-special
index 2a8ca70aeb..6357d682d9 100644
--- a/usr.sbin/ctm/mkCTM/ctm_conf.src-special
+++ b/usr.sbin/ctm/mkCTM/ctm_conf.src-special
@@ -1,9 +1,10 @@
 #!/usr/local/bin/tclsh
+# $DragonFly: src/usr.sbin/ctm/mkCTM/Attic/ctm_conf.src-special,v 1.2 2003/08/05 07:45:44 asmodai Exp $
 
 set CTMname	src-cur
 set CTMref	$CTMSW/../$CTMname
 set CTMcopy	/c/phk/20R/usr/src
-set CTMdont	{\.core$|/CVS$|/CVS/|^/secure|^/eBones|/#cvs|/\.#}
+set CTMdont	{\.core$|/CVS$|/CVS/|^/secure|/#cvs|/\.#}
 set CTMtest	1
 set CTMspecial	1
 set CTMsuff	R20
-- 
2.41.0