Enable build of unified libkrb5. ok deraadt, todd. Testing by hin, jakob, David Krause, ...

34 files changed, 199 insertions, 184 deletions

diff --git a/include/Makefile b/include/Makefile
index f76c6303a54..11994332bdf 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.118 2003/06/02 08:45:58 markus Exp $
+#	$OpenBSD: Makefile,v 1.119 2003/07/14 16:14:43 mho Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -61,7 +61,7 @@ NOOBJ=	noobj
 .include <bsd.own.mk>
 SYS_INCLUDE?=	copies
 .if ${KERBEROS5:L} == "yes"
-RDIRS+=	../kerberosV/lib
+RDIRS+= ../lib/libkrb5 ../lib/libgssapi ../lib/libkadm5srv
 .endif
 
 prereq:
diff --git a/kerberosV/Makefile b/kerberosV/Makefile
index 3c8ab5bf25b..06d1b924e4c 100644
--- a/kerberosV/Makefile
+++ b/kerberosV/Makefile
@@ -1,14 +1,5 @@
-# $OpenBSD: Makefile,v 1.11 2003/05/13 02:47:06 hin Exp $
+# $OpenBSD: Makefile,v 1.12 2003/07/14 16:14:43 mho Exp $
 
-SUBDIR	= lib usr.bin libexec usr.sbin doc
-
-build:
-	cd ../kerberosIV/lib/sl && exec ${MAKE}
-	cd lib/roken && exec ${MAKE}
-	${SUDO} ${MAKE} includes
-	${MAKE} depend
-	cd lib && ${MAKE} && exec ${SUDO} ${MAKE} install
-	${MAKE}
-	${SUDO} ${MAKE} install
+SUBDIR	= usr.bin lib libexec usr.sbin doc
 
 .include <bsd.subdir.mk>
diff --git a/kerberosV/Makefile.inc b/kerberosV/Makefile.inc
index 75133cd4d2c..dbb97b1a67d 100644
--- a/kerberosV/Makefile.inc
+++ b/kerberosV/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2003/05/14 08:01:02 mho Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2003/07/14 16:14:43 mho Exp $
 
 KRB5DIR	= ${.CURDIR}/${KRBDEPTH}
 KRB5SRC	= ${.CURDIR}/${KRBDEPTH}/src
@@ -14,11 +14,10 @@ CFLAGS+=	-Wall
 CFLAGS	+= -DHAVE_DLOPEN
 .endif
 
-LIBROKEN= 	-L${KRBDEPTH}/lib/roken -lroken
-LIBROKEN_PIC= 	-L${KRBDEPTH}/lib/roken -lroken_pic
+PRINTVER=	print_version.c
+ROKENSRC=	${KRB5SRC}/lib/roken
 
 .PATH:	${KRB5SRC}/man
+.PATH:	${KRB5DIR}/openbsd-vers
 
 COMPILE_ET	= /usr/bin/compile_et
-
-COM_ERR=	-lcom_err_pic
diff --git a/kerberosV/lib/Makefile b/kerberosV/lib/Makefile
index a2bbc4b1b37..00249ece445 100644
--- a/kerberosV/lib/Makefile
+++ b/kerberosV/lib/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/14 07:54:30 mho Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:43 mho Exp $
 
-SUBDIR	= roken asn1 krb5 hdb kadm5clnt kadm5srv gssapi kafs
+SUBDIR	= roken
 
 .include <bsd.subdir.mk>
diff --git a/kerberosV/lib/roken/Makefile b/kerberosV/lib/roken/Makefile
index fefc4ea33b1..e6149c368ea 100644
--- a/kerberosV/lib/roken/Makefile
+++ b/kerberosV/lib/roken/Makefile
@@ -1,57 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2002/06/09 19:01:59 hin Exp $
+# $OpenBSD: Makefile,v 1.10 2003/07/14 16:14:43 mho Exp $
 
-LIB	= roken
-
-NOPROFILE=
-
-KRBDEPTH=../..
-.include <${.CURDIR}/../../Makefile.inc>
-
-.PATH:	${KRB5SRC}/lib/roken
-test:
-	echo ${KRB4SRC} 
-CFLAGS	+= -I.
-
-SRCS=	base64.c		\
-	concat.c		\
-	emalloc.c		\
-	eread.c			\
-	erealloc.c		\
-	esetenv.c		\
-	estrdup.c		\
-	ewrite.c		\
-	getaddrinfo_hostspec.c	\
-	getnameinfo_verified.c	\
-	get_default_username.c	\
-	get_window_size.c	\
-	getarg.c		\
-	issuid.c		\
-	k_getpwnam.c		\
-	k_getpwuid.c		\
-	mini_inetd.c		\
-	net_read.c		\
-	net_write.c		\
-	parse_bytes.c		\
-	parse_time.c		\
-	parse_units.c		\
-	resolve.c		\
-	roken_gethostby.c	\
-	rtbl.c			\
-	tm2time.c		\
-	verify.c		\
-	strcollect.c		\
-	strlwr.c		\
-	strndup.c		\
-	strnlen.c		\
-	strsep_copy.c		\
-	strupr.c		\
-	print_version.c		\
-	simple_exec.c		\
-	socket.c		\
-	warnerr.c		\
-	write_pid.c
+all:
 
 install:
 
 
-.include <bsd.lib.mk>
+.include <bsd.prog.mk>
diff --git a/kerberosV/libexec/Makefile b/kerberosV/libexec/Makefile
index bac3b1fa4b5..e252623c223 100644
--- a/kerberosV/libexec/Makefile
+++ b/kerberosV/libexec/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2002/09/23 01:45:06 miod Exp $
+# $OpenBSD: Makefile,v 1.5 2003/07/14 16:14:43 mho Exp $
+
+# kfd - not imported?
 
-# kfd
 SUBDIR=	kdc kadmind hprop hpropd ipropd-master ipropd-slave kpasswdd
 
 .include <bsd.subdir.mk>
diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile
index c401f6f3597..1ccd606fbc6 100644
--- a/kerberosV/libexec/hprop/Makefile
+++ b/kerberosV/libexec/hprop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:43 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,12 +7,15 @@ PROG=	hprop
 MAN=	${PROG}.8
 
 SRCS=	hprop.c mit_dump.c v4_dump.c hprop.h kadb.h
+SRCS+=	${PRINTVER}
+SRCS+=	tm2time.c
 
 .PATH:	${KRB5SRC}/kdc
+.PATH:	${ROKENSRC}
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKDB} ${LIBKRB} ${LIBKDB} ${LIBASN1} \
-	${LIBCOM_ERR} ${LIBKAFS} ${LIBDES} ${LIBCRYPTO}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 \
-	-lcom_err -ldes -lcrypto
+
+DPADD+= ${LIBKADM5SRV} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkadm5srv -lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile
index 19903fc96c2..bcdb4b6cf34 100644
--- a/kerberosV/libexec/hpropd/Makefile
+++ b/kerberosV/libexec/hpropd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:43 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,12 +7,15 @@ PROG=	hpropd
 MAN=	${PROG}.8
 
 SRCS=	hpropd.c
+SRCS+=	${PRINTVER}
+SRCS+=	mini_inetd.c socket.c tm2time.c 
 
 .PATH:	${KRB5SRC}/kdc
+.PATH:	${ROKENSRC}
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -ldes
+
+DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBDES}
+LDADD+=	-lkadm5srv -lkrb5 -lcrypto -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index 771db7aec2a..9df8374d7c3 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,19 +1,22 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
 PROG=	ipropd-master
 MAN=	${PROG}.8
+NOMAN=
 
 SRCS=	ipropd_master.c
-NOMAN=
+SRCS+=	${PRINTVER}
+SRCS+=	rtbl.c
 
 .PATH:	${KRB5SRC}/lib/kadm5
-CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} ${LIBDES}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lhdb -lutil -ldes
+.PATH:	${ROKENSRC}
+
+CFLAGS+=-I${KRB5SRC}/lib/krb5
+
+DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES}
+LDADD+=	-lkadm5srv -lkrb5 -lcrypto -lutil -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile
index e26753c4e7f..215c2b1ef55 100644
--- a/kerberosV/libexec/ipropd-slave/Makefile
+++ b/kerberosV/libexec/ipropd-slave/Makefile
@@ -1,19 +1,20 @@
-# $OpenBSD: Makefile,v 1.7 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.8 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
 PROG=	ipropd-slave
 MAN=	${PROG}.8
+NOMAN=
 
 SRCS=	ipropd_slave.c
-NOMAN=
+SRCS+=	${PRINTVER}
 
 .PATH:	${KRB5SRC}/lib/kadm5
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} ${LIBDES}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lhdb -lutil -ldes
+
+DPADD+= ${LIBKADM5SRV} ${LIBKRB5} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES}
+LDADD+=	-lkadm5srv -lkrb5 -lcrypto -lutil -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kadmind/Makefile b/kerberosV/libexec/kadmind/Makefile
index a20e78976a3..3099137e1ac 100644
--- a/kerberosV/libexec/kadmind/Makefile
+++ b/kerberosV/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2003/05/14 07:02:19 mho Exp $
+# $OpenBSD: Makefile,v 1.12 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,12 +7,15 @@ PROG=	kadmind
 MAN=	${PROG}.8
 
 SRCS=	kadmind.c server.c kadm_conn.c
+SRCS+=	${PRINTVER}
+SRCS+=	mini_inetd.c socket.c
 
 .PATH:	${KRB5SRC}/kadmin
-CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+=	${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBDES} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBUTIL}
-LDADD+=	-lhdb -lkadm5srv -lkrb5 -ldes ${LIBROKEN} -lasn1 \
-	-lcrypto -lcom_err -lutil
+.PATH:	${ROKENSRC}
+
+CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc
+
+DPADD+=	${LIBKADM5SRV} ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} ${LIBUTIL}
+LDADD+=	-lkadm5srv -lkrb5 -ldes -lcrypto -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile
index 400eb569cff..6d82b849a36 100644
--- a/kerberosV/libexec/kdc/Makefile
+++ b/kerberosV/libexec/kdc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2003/05/14 07:20:34 mho Exp $
+# $OpenBSD: Makefile,v 1.11 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -16,12 +16,15 @@ SRCS=	524.c \
 	main.c \
 	misc.c \
 	rx.h
+SRCS+=	${PRINTVER}
+SRCS+=	parse_bytes.c
 
 .PATH:	${KRB5SRC}/kdc
+.PATH:	${ROKENSRC}
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc
-DPADD+=	${LIBHDB} ${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR} ${LIBUTIL}
-LDADD+=	-lhdb -lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lutil
+
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO} ${LIBUTIL}
+LDADD+=	-lkrb5 -ldes -lcrypto -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kfd/Makefile b/kerberosV/libexec/kfd/Makefile
index 0ff020f88b0..9c84bd0b4bb 100644
--- a/kerberosV/libexec/kfd/Makefile
+++ b/kerberosV/libexec/kfd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -9,9 +9,10 @@ MAN=	${PROG}.8
 SRCS=	kfd.c
 
 .PATH:	${KRB5SRC}/appl/kf
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5
-DPADD+=	${LIBHDB} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR} ${LIBKAFS}
-LDADD+=	-lhdb -lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile
index dd4c66d3c59..57a5d441f4d 100644
--- a/kerberosV/libexec/kpasswdd/Makefile
+++ b/kerberosV/libexec/kpasswdd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.10 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,11 +6,14 @@ KRBDEPTH=../..
 PROG=	kpasswdd
 MAN=	${PROG}.8
 
+SRCS=	kpasswdd.c
+SRCS+=	${PRINTVER}
+
 .PATH:	${KRB5SRC}/kpasswd
+
 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 -ldes ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lutil
+
+DPADD+=	${LIBKADM5SRV} ${LIBKRB5} ${LIBDES} ${LIBCRYPTO} ${LIBUTIL}
+LDADD+=	-lkadm5srv -lkrb5 -ldes -lcrypto -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/src/lib/com_err/com_err.h b/kerberosV/src/lib/com_err/com_err.h
index 7c22553f9af..383d88e691b 100644
--- a/kerberosV/src/lib/com_err/com_err.h
+++ b/kerberosV/src/lib/com_err/com_err.h
@@ -38,7 +38,7 @@
 #ifndef __COM_ERR_H__
 #define __COM_ERR_H__
 
-#include <com_right.h>
+#include <kerberosV/com_right.h>
 
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(X)
diff --git a/kerberosV/src/lib/kadm5/kadm5_locl.h b/kerberosV/src/lib/kadm5/kadm5_locl.h
index 75e9f0dae0c..79f2f955ef4 100644
--- a/kerberosV/src/lib/kadm5/kadm5_locl.h
+++ b/kerberosV/src/lib/kadm5/kadm5_locl.h
@@ -74,8 +74,8 @@
 #include <netdb.h>
 #endif
 #include <fnmatch.h>
-#include "admin.h"
-#include "kadm5_err.h"
+#include <kerberosV/kadm5/admin.h>
+#include <kerberosV/kadm5/kadm5_err.h>
 #include <hdb.h>
 #include <der.h>
 #include <roken.h>
diff --git a/kerberosV/usr.bin/Makefile b/kerberosV/usr.bin/Makefile
index f8807d02940..f8ac28c311c 100644
--- a/kerberosV/usr.bin/Makefile
+++ b/kerberosV/usr.bin/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2002/09/23 01:45:08 miod Exp $
+# $OpenBSD: Makefile,v 1.9 2003/07/14 16:14:44 mho Exp $
 
 # XXX asn1_compile is compiled in ../Makefile
 
-# kf
+# kf - not imported?
+
 SUBDIR=	afslog \
 	kauth \
 	kdestroy \
diff --git a/kerberosV/usr.bin/afslog/Makefile b/kerberosV/usr.bin/afslog/Makefile
index b12fd2abe37..e62241107e6 100644
--- a/kerberosV/usr.bin/afslog/Makefile
+++ b/kerberosV/usr.bin/afslog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,8 +7,10 @@ PROG	= afslog
 
 .PATH:	${KRB5SRC}/appl/afsutil
 
-CFLAGS	+= -I.
-DPADD	+= ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} ${LIBASN1}
-LDADD	+= -lkrb5 -ldes -lcrypto -lasn1 ${LIBROKEN} -lcom_err
+SRCS+=	afslog.c
+SRCS+=	${PRINTVER}
+
+DPADD	+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD	+= -lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile
index 913608ed802..c8f7943cbc5 100644
--- a/kerberosV/usr.bin/kauth/Makefile
+++ b/kerberosV/usr.bin/kauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/14 06:53:34 mho Exp $
+# $OpenBSD: Makefile,v 1.7 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,10 +7,11 @@ PROG=	kauth
 NOMAN=
 
 SRCS=	kinit.c
+SRCS+=	${PRINTVER}
 
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index baf4c241e3e..c8133152dd2 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,11 +6,11 @@ KRBDEPTH=../..
 PROG=	kdestroy
 
 SRCS=	kdestroy.c
+SRCS+=	${PRINTVER}
 
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lasn1 -lcrypto ${LIBROKEN} -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile
index 48e0551c8df..2817d244f42 100644
--- a/kerberosV/usr.bin/kf/Makefile
+++ b/kerberosV/usr.bin/kf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -9,8 +9,7 @@ SRCS=	kf.c
 
 .PATH:	${KRB5SRC}/appl/kf
 
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes -lkafs -l45 -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index b105a7eb73d..39d81687874 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/05/14 06:56:02 mho Exp $
+# $OpenBSD: Makefile,v 1.8 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,9 +6,12 @@ KRBDEPTH=../..
 PROG=	kinit
 MLINKS=	kinit.1 kauth.1
 
+SRCS=	kinit.c
+SRCS+=	${PRINTVER}
+
 .PATH:	${KRB5SRC}/kuser
 
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile
index 50a0260088c..23c06f8d2c1 100644
--- a/kerberosV/usr.bin/klist/Makefile
+++ b/kerberosV/usr.bin/klist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,12 +6,13 @@ KRBDEPTH=../..
 PROG=	klist
 
 SRCS=	klist.c
+SRCS+=	${PRINTVER}
+SRCS+=	rtbl.c
 
 .PATH:	${KRB5SRC}/kuser
+.PATH:	${ROKENSRC}
 
-CFLAGS+=-I${KRB5SRC}/lib/roken
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/pagsh/Makefile b/kerberosV/usr.bin/pagsh/Makefile
index 50cbdcd8c1b..aeaab5347b4 100644
--- a/kerberosV/usr.bin/pagsh/Makefile
+++ b/kerberosV/usr.bin/pagsh/Makefile
@@ -1,15 +1,18 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/07/14 16:14:44 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
 PROG=	pagsh
 
+SRCS=	pagsh.c
+SRCS+=	${PRINTVER}
+SRCS+=	esetenv.c k_getpwuid.c
+
 .PATH:	${KRB5SRC}/appl/afsutil
+.PATH:	${ROKENSRC}
 
-CFLAGS+=-I${KRB5SRC}/lib/roken
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile
index 22cf14cea96..826192c2882 100644
--- a/kerberosV/usr.bin/string2key/Makefile
+++ b/kerberosV/usr.bin/string2key/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,11 +6,16 @@ KRBDEPTH=../..
 PROG=	string2key
 MAN=	${PROG}.8
 
+SRCS=	string2key.c
+SRCS+=	${PRINTVER}
+SRCS+=	estrdup.c
+
 .PATH:	${KRB5SRC}/kdc
+.PATH:	${ROKENSRC}
 
 CFLAGS+=-I${KRB5SRC}/kdc -I${KRB5SRC}/lib/krb5
-DPADD+=	${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+
+DPADD+=	${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index 9e14af9ee22..1004407f175 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,16 +1,19 @@
-# $OpenBSD: Makefile,v 1.3 2003/05/17 01:31:21 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
 PROG=	verify_krb5_conf
+MAN=	${PROG}.8
+
+SRCS=	verify_krb5_conf.c
+SRCS+=	${PRINTVER}
+SRCS+=	parse_bytes.c
 
 .PATH:	${KRB5SRC}/lib/krb5
-MAN=	${PROG}.8
+.PATH:	${ROKENSRC}
 
-CFLAGS+=-I${KRB5SRC}/lib/roken
-DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCOM_ERR}
-LDADD+=	-lkrb5 -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err
+DPADD+= ${LIBKRB5} ${LIBDES} ${LIBCRYPTO}
+LDADD+=	-lkrb5 -ldes -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/Makefile b/kerberosV/usr.sbin/Makefile
index 2430019b80d..a583e6fa536 100644
--- a/kerberosV/usr.sbin/Makefile
+++ b/kerberosV/usr.sbin/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:21:11 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2003/07/14 16:14:45 mho Exp $
 
-SUBDIR=	kadmin ktutil
+SUBDIR=	kadmin kstash ktutil
 
 .include <bsd.subdir.mk>
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index a588c8b4dd8..e98725dcbf8 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2003/05/14 06:59:55 mho Exp $
+# $OpenBSD: Makefile,v 1.13 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -22,13 +22,18 @@ SRCS=	ank.c \
 	random_password.c \
 	kadmin_locl.h \
 	sl.c
+SRCS+=	${PRINTVER}
+SRCS+=	tm2time.c get_default_username.c k_getpwnam.c k_getpwuid.c
 
 .PATH:	${KRB5SRC}/kadmin
 .PATH:	${KRB5SRC}/lib/sl
+.PATH:	${ROKENSRC}
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBHDB} ${LIBKADM5SRV} ${LIBKADM5CLNT} \
-	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBDES}
-LDADD+=	-lreadline -lcurses -lhdb -lkadm5srv -lkadm5clnt \
-	-lkrb5 ${LIBROKEN} -lasn1 -lcrypto -lcom_err -ldes
+
+DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \
+	${LIBKRB5} ${LIBCRYPTO} ${LIBDES}
+LDADD+=	-lreadline -lcurses -lkadm5srv -lkadm5clnt \
+	-lkrb5 -lcrypto -ldes
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile
index 90666a97d4e..0511e8a8ce1 100644
--- a/kerberosV/usr.sbin/kstash/Makefile
+++ b/kerberosV/usr.sbin/kstash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/05/14 08:01:02 mho Exp $
+# $OpenBSD: Makefile,v 1.5 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -8,13 +8,16 @@ NOMAN=
 
 SRCS=	kstash.c \
 	sl.c
+SRCS+=	${PRINTVER}
 
 .PATH:	${KRB5SRC}/kdc
 .PATH:	${KRB5SRC}/lib/sl
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBDES} ${LIBHDB} \
-	${LIBKRB5} ${LIBCRYPTO} ${LIBKADM5SRV} ${LIBKADM5CLNT}
-LDADD+=	-lreadline -lcurses -ldes -lhdb \
-	-lkrb5 -lcrypto -lkadm5srv -lkadm5clnt ${LIBROKEN}
+
+DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBDES} ${LIBKRB5} \
+	${LIBCRYPTO} ${LIBKADM5SRV} ${LIBKADM5CLNT}
+LDADD+=	-lreadline -lcurses -ldes -lkrb5 \
+	-lcrypto -lkadm5srv -lkadm5clnt
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile
index 6b8a79bdb15..c4b47a07f07 100644
--- a/kerberosV/usr.sbin/ktutil/Makefile
+++ b/kerberosV/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2003/05/14 07:18:27 mho Exp $
+# $OpenBSD: Makefile,v 1.10 2003/07/14 16:14:45 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -16,13 +16,18 @@ SRCS=	add.c \
 	remove.c \
 	rename.c \
 	sl.c
+SRCS+=	${PRINTVER}
+SRCS+=	get_default_username.c k_getpwnam.c k_getpwuid.c
 
 .PATH:	${KRB5SRC}/admin
 .PATH:	${KRB5SRC}/lib/sl
+.PATH:	${ROKENSRC}
+
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
-DPADD+=	${LIBREADLINE} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBHDB} \
-	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBDES}
-LDADD+=	-lreadline -lcurses -lkadm5clnt -lhdb \
-	-lkrb5 ${LIBROKEN} -lasn1 -lcrypto -lcom_err -ldes
+
+DPADD+=	${LIBREADLINE} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \
+	${LIBCRYPTO} ${LIBDES}
+LDADD+=	-lreadline -lcurses -lkadm5clnt -lkrb5 \
+	-lcrypto -ldes
 
 .include <bsd.prog.mk>
diff --git a/lib/Makefile b/lib/Makefile
index 95775100fe7..2f982165b1e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,9 +1,15 @@
-#	$OpenBSD: Makefile,v 1.49 2003/05/14 01:46:51 hin Exp $
+#	$OpenBSD: Makefile,v 1.50 2003/07/14 16:14:42 mho Exp $
 #	$NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $
 
-SUBDIR=	csu libarch libc libcom_err libcompat libcurses libcurses++ \
+SUBDIR=	csu libarch libc libcompat libcurses libcurses++ \
 	libdes libedit libevent libform libkeynote libkvm libl libm libmenu \
 	libocurses libossaudio libpanel libpcap libpthread libresolv librpcsvc \
 	libskey libsectok libssl libusbhid libutil libwrap liby libz
 
+.include <bsd.own.mk>
+
+.if (${KERBEROS5:L} == "yes")
+SUBDIR+=libgssapi libkadm5srv libkadm5clnt libkrb5
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile
index 25f9ff1c04a..e3371fb01a7 100644
--- a/lib/libkadm5srv/Makefile
+++ b/lib/libkadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/17 05:20:18 mho Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:43 mho Exp $
 
 KRB5DIR	= ${.CURDIR}/../../kerberosV
 .include <${.CURDIR}/../libkrb5/Makefile.common.inc>
@@ -26,7 +26,8 @@ includes:	kadm5_err.h
 		cmp -s $$i ${DESTDIR}/usr/include/kerberosV/kadm5/$$i || \
 			${INSTALL} ${INSTALL_COPY} -m 444 \
 			-o ${BINOWN} -g $(BINGRP) $$i \
-			${DESTDIR}/usr/include/kerberosV/kadm5; done
+			${DESTDIR}/usr/include/kerberosV/kadm5; done; \
+		echo
 
 SRCS=	acl.c           \
 	admin.h         \
diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile
index a92e23e6767..f4f878dffae 100644
--- a/lib/libkrb5/Makefile
+++ b/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2003/06/03 09:18:00 hin Exp $
+# $OpenBSD: Makefile,v 1.10 2003/07/14 16:14:43 mho Exp $
 
 KRB5DIR=	${.CURDIR}/../../kerberosV
 GENDIR=		${.CURDIR}/generated
@@ -10,6 +10,7 @@ LIB	= krb5
 .PATH:	${GENDIR}
 
 .include "Makefile.asn1.inc"
+.include "Makefile.com_err.inc"
 .include "Makefile.hdb.inc"
 .include "Makefile.kafs.inc"
 .include "Makefile.roken.inc"
@@ -17,6 +18,12 @@ LIB	= krb5
 .include "Makefile.com_err.inc"
 
 includes:
+	@echo "Removing old Kerberos include files (transitionary)"
+	@/bin/rm -rf ${DESTDIR}/usr/include/kerberosV \
+		${DESTDIR}/usr/include/kerberosIV \
+		${DESTDIR}/usr/include/com_err.h
+	@echo "Symlinking /usr/include/com_err.h (transitionary)"
+	@/bin/ln -s /usr/include/kerberosV/com_err.h ${DESTDIR}/usr/include/
 	@test -d ${DESTDIR}/usr/include/kerberosV || \
 		mkdir ${DESTDIR}/usr/include/kerberosV
 	@echo -n ${DIR_KRB5INC}:; \
@@ -43,6 +50,14 @@ includes:
 			-o ${BINOWN} -g $(BINGRP) $$i \
 			${DESTDIR}/usr/include/kerberosV; done; \
 		echo
+	@echo -n ${DIR_COM_ERR}:; \
+	cd ${DIR_COM_ERR}; for i in ${HDR_COM_ERR}; do \
+		echo -n " $$i"; \
+		cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+			${INSTALL} ${INSTALL_COPY} -m 444 \
+			-o ${BINOWN} -g $(BINGRP) $$i \
+			${DESTDIR}/usr/include/kerberosV; done; \
+		echo
 	@echo -n ${DIR_HDB}:; \
 	cd ${DIR_HDB}; for i in ${HDR_HDB}; do \
 		echo -n " $$i"; \
diff --git a/usr.bin/compile_et/compile_et.c b/usr.bin/compile_et/compile_et.c
index cb3b75e2b72..ad0fb14e848 100644
--- a/usr.bin/compile_et/compile_et.c
+++ b/usr.bin/compile_et/compile_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compile_et.c,v 1.10 2003/06/25 21:19:34 deraadt Exp $	*/
+/*	$OpenBSD: compile_et.c,v 1.11 2003/07/14 16:14:43 mho Exp $	*/
 /*
  * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
@@ -147,7 +147,7 @@ generate_h(void)
 	fprintf(h_file, "#ifndef %s\n", fn);
 	fprintf(h_file, "#define %s\n", fn);
 	fprintf(h_file, "\n");
-	fprintf(h_file, "#include <com_err.h>\n");
+	fprintf(h_file, "#include <kerberosV/com_err.h>\n");
 	fprintf(h_file, "\n");
 	fprintf(h_file, 
 	    "void initialize_%s_error_table_r(struct et_list **);\n",