Remove krb4 support.

4 files changed, 19 insertions, 21 deletions

diff --git a/kerberosV/libexec/kadmind/Makefile b/kerberosV/libexec/kadmind/Makefile
index 571da08c436..a20e78976a3 100644
--- a/kerberosV/libexec/kadmind/Makefile
+++ b/kerberosV/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2003/05/14 07:02:19 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,13 +6,13 @@ KRBDEPTH=../..
 PROG=	kadmind
 MAN=	${PROG}.8
 
-SRCS=	kadmind.c server.c version4.c kadm_conn.c
+SRCS=	kadmind.c server.c kadm_conn.c
 
 .PATH:	${KRB5SRC}/kadmin
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+=	${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lkafs -lutil
+DPADD+=	${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBDES} ${LIBASN1} \
+	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBUTIL}
+LDADD+=	-lhdb -lkadm5srv -lkrb5 -ldes ${LIBROKEN} -lasn1 \
+	-lcrypto -lcom_err -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile
index 335ddc07e4d..913608ed802 100644
--- a/kerberosV/usr.bin/kauth/Makefile
+++ b/kerberosV/usr.bin/kauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/14 06:53:34 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -10,8 +10,7 @@ SRCS=	kinit.c
 
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -l45 -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
+LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index c44c31102dc..b105a7eb73d 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2003/05/14 06:56:02 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -8,9 +8,7 @@ MLINKS=	kinit.1 kauth.1
 
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBKAFS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -l45 -lkrb -lkafs ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
+LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index d6736b57dae..a588c8b4dd8 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2003/05/11 04:10:55 hin Exp $
+# $OpenBSD: Makefile,v 1.12 2003/05/14 06:59:55 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -20,14 +20,15 @@ SRCS=	ank.c \
 	rename.c \
 	util.c \
 	random_password.c \
-	kadmin_locl.h
+	kadmin_locl.h \
+	sl.c
 
 .PATH:	${KRB5SRC}/kadmin
+.PATH:	${KRB5SRC}/lib/sl
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBHDB} ${LIBKADM5SRV} ${LIBKADM5CLNT} \
-	${LIBKRB5} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} \
-	${LIBDES}
-LDADD+=	${LIBSL} -lreadline -lcurses -lhdb -lkadm5srv \
-	-lkadm5clnt -lkrb5 ${LIBROKEN} -lkrb -lasn1 -lcrypto -lcom_err -lkafs -ldes
+	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBDES}
+LDADD+=	-lreadline -lcurses -lhdb -lkadm5srv -lkadm5clnt \
+	-lkrb5 ${LIBROKEN} -lasn1 -lcrypto -lcom_err -ldes
 
 .include <bsd.prog.mk>