11 files changed, 101 insertions, 26 deletions

diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 737f13e871ef..da141e50031f 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	kadmin kdestroy kinit klist kpasswd krb5-config ksu \
-	verify_krb5_conf
+SUBDIR=	hxtool kadmin kcc kdestroy kgetcred kf kinit kpasswd krb5-config ksu \
+	string2key verify_krb5_conf
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile
new file mode 100644
index 000000000000..c40f009380f1
--- /dev/null
+++ b/kerberos5/usr.bin/hxtool/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PROG=	hxtool
+NO_MAN=	1
+CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/sl -I.
+DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
+LDADD=	-lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit
+SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h
+
+hxtool-commands.c hxtool-commands.h: hxtool-commands.in
+	slc ${.ALLSRC:M*.in}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/hx509
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index f8d358f18ff9..d0f8ed19000f 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -38,11 +38,8 @@ LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-kadmin-commands.c kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in ../../tools/slc/slc
-	../../tools/slc/slc ${.ALLSRC:M*.in}
-
-../../tools/slc/slc:
-	cd ${.CURDIR}/../../tools/slc && ${MAKE}
+kadmin-commands.c kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in
+	slc ${.ALLSRC:M*.in}
 
 .PATH: ${KRB5DIR}/kadmin
 
diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile
new file mode 100644
index 000000000000..d690b32fe4cb
--- /dev/null
+++ b/kerberos5/usr.bin/kcc/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PROG=	kcc
+MAN=	klist.1 kswitch.1
+LINKS=	${BINDIR}/kcc ${BINDIR}/klist \
+	${BINDIR}/kcc ${BINDIR}/kswitch
+CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/sl -I.
+DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+	${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
+LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \
+	${LIBVERS} -ledit
+SRCS=	kcc.c \
+	kcc-commands.c \
+	kcc-commands.h \
+	klist.c \
+	kswitch.c \
+	copy_cred_cache.c
+
+kcc-commands.c kcc-commands.h: kcc-commands.in
+	slc ${.ALLSRC:M*.in}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 592f5e69a572..b3946e42fd29 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -2,10 +2,11 @@
 
 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt
+MAN=	kdestroy.1
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile
new file mode 100644
index 000000000000..0a1ccec20fe2
--- /dev/null
+++ b/kerberos5/usr.bin/kf/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PROG=	kf
+MAN=	kf.1
+SRCS=	kf.c kf_locl.h
+CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/roken
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+	${LIBCRYPT} ${LIBVERS}
+LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
+	${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/appl/kf
diff --git a/kerberos5/usr.bin/kgetcred/Makefile b/kerberos5/usr.bin/kgetcred/Makefile
new file mode 100644
index 000000000000..dac38adcc18a
--- /dev/null
+++ b/kerberos5/usr.bin/kgetcred/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PROG=	kgetcred
+CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/roken
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
+LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index e80f06d1235e..e0229f98079d 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -2,9 +2,9 @@
 
 PROG=	kinit
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lheimntlm -lroken ${LIBVERS} \
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
deleted file mode 100644
index a76cc0ac054e..000000000000
--- a/kerberos5/usr.bin/klist/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-PROG=	klist
-CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index 710de03108d0..202d1de373e6 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -18,6 +18,7 @@ krb5-config: krb5-config.in
 	    -e "s,@LIB_pkinit\@,-lhx509,g" \
 	    -e "s,@LIB_dlopen\@,,g" \
 	    -e "s,@LIB_door_create\@,,g" \
+	    -e "s,@PTHREAD_LIBADD\@,-pthread,g" \
 	    -e "s,@LIBS\@,,g" \
 	    -e "s,@INCLUDE_hcrypto@,,g" \
 	    ${.ALLSRC} > ${.TARGET}
diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile
new file mode 100644
index 000000000000..25204fd3a121
--- /dev/null
+++ b/kerberos5/usr.bin/string2key/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PROG=	string2key
+MAN=	string2key.8
+CFLAGS+=	-I${KRB5DIR}/kdc \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/windc
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+	${LIBCRYPT} ${LIBVERS}
+LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+SRCS=	string2key.c headers.h
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kdc