- Update FreeBSD Heimdal distribution to version 1.5.1. This also brings

  several new kerberos related libraries and applications to FreeBSD:
  o kgetcred(1) allows one to manually get a ticket for a particular service.
  o kf(1) securily forwards ticket to another host through an authenticated
    and encrypted stream.
  o kcc(1) is an umbrella program around klist(1), kswitch(1), kgetcred(1)
    and other user kerberos operations. klist and kswitch are just symlinks
    to kcc(1) now.
  o kswitch(1) allows you to easily switch between kerberos credentials if
    you're running KCM.
  o hxtool(1) is a certificate management tool to use with PKINIT.
  o string2key(1) maps a password into key.
  o kdigest(8) is a userland tool to access the KDC's digest interface.
  o kimpersonate(8) creates a "fake" ticket for a service.

  We also now install manpages for some lirbaries that were not installed
  before, libheimntlm and libhx509.

- The new HEIMDAL version no longer supports Kerberos 4.  All users are
  recommended to switch to Kerberos 5.

- Weak ciphers are now disabled by default.  To enable DES support (used
  by telnet(8)), use "allow_weak_crypto" option in krb5.conf.

- libtelnet, pam_ksu and pam_krb5 are now compiled with error on warnings
  disabled due to the function they use (krb5_get_err_text(3)) being
  deprecated.  I plan to work on this next.

- Heimdal's KDC now require sqlite to operate.  We use the bundled version
  and install it as libheimsqlite.  If some other FreeBSD components will
  require it in the future we can rename it to libbsdsqlite and use for these
  components as well.

- This is not a latest Heimdal version, the new one was released while I was
  working on the update.  I will update it to 1.5.2 soon, as it fixes some
  important bugs and security issues.

11 files changed, 101 insertions, 26 deletions

diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 737f13e8..da141e5 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 0000000..c40f009
--- /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 f8d358f..d0f8ed1 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 0000000..d690b32
--- /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 592f5e6..b3946e4 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 0000000..0a1ccec
--- /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 0000000..dac38ad
--- /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 e80f06d..e0229f9 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 a76cc0a..0000000
--- 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 710de03..202d1de 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 0000000..25204fd
--- /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