Bring in rest of K5 (AKA Heimdal) userland.

The brave amongst you may want to start playing with this (ATM
experimental) code.

6 files changed, 182 insertions, 0 deletions

diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile
new file mode 100644
index 0000000..a9acbe0
--- /dev/null
+++ b/kerberos5/usr.sbin/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	kadmin kstash ktutil
+
+.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.sbin/Makefile.inc b/kerberos5/usr.sbin/Makefile.inc
new file mode 100644
index 0000000..dab729d
--- /dev/null
+++ b/kerberos5/usr.sbin/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+BINDIR=	/usr/sbin
+
+.include "../Makefile.inc"
diff --git a/kerberos5/usr.sbin/k5admin/Makefile b/kerberos5/usr.sbin/k5admin/Makefile
new file mode 100644
index 0000000..7f181df
--- /dev/null
+++ b/kerberos5/usr.sbin/k5admin/Makefile
@@ -0,0 +1,49 @@
+# $FreeBSD$
+
+PROG=		kadmin
+SRCS=		kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
+		get.c ext.c random_password.c mod.c rename.c util.c \
+		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
+		krb5_err.h heim_err.h
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/hdb \
+		-I${KRB5DIR}/lib/sl \
+		-I${KRB5DIR}/kadmin \
+		-I${ASN1OBJDIR} \
+		-I${HDBOBJDIR} \
+		-I${.OBJDIR}
+.if defined(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
+		-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
+		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err -lreadline
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+NOMAN=		yes
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kadmin
+
+kadm5/private.h:	kadm5
+	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+
+kadm5/admin.h:	kadm5
+	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+
+kadm5/kadm5_err.h: kadm5 kadm5_err.h
+	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
+
+kadm5:
+	mkdir ${.TARGET}
+
+CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
+CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
new file mode 100644
index 0000000..89b1b52
--- /dev/null
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PROG=		kstash
+SRCS=		kstash.c hdb_err.h
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/hdb \
+		-I${KRB5DIR}/kdc \
+		-I${ASN1OBJDIR} \
+		-I${HDBOBJDIR} \
+		-I${.OBJDIR}
+.if defined(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+MAN8=		kstash.8
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kdc
diff --git a/kerberos5/usr.sbin/kadmin/Makefile b/kerberos5/usr.sbin/kadmin/Makefile
new file mode 100644
index 0000000..7f181df
--- /dev/null
+++ b/kerberos5/usr.sbin/kadmin/Makefile
@@ -0,0 +1,49 @@
+# $FreeBSD$
+
+PROG=		kadmin
+SRCS=		kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
+		get.c ext.c random_password.c mod.c rename.c util.c \
+		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
+		krb5_err.h heim_err.h
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/hdb \
+		-I${KRB5DIR}/lib/sl \
+		-I${KRB5DIR}/kadmin \
+		-I${ASN1OBJDIR} \
+		-I${HDBOBJDIR} \
+		-I${.OBJDIR}
+.if defined(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
+		-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
+		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err -lreadline
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+NOMAN=		yes
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kadmin
+
+kadm5/private.h:	kadm5
+	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+
+kadm5/admin.h:	kadm5
+	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+
+kadm5/kadm5_err.h: kadm5 kadm5_err.h
+	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
+
+kadm5:
+	mkdir ${.TARGET}
+
+CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
+CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
new file mode 100644
index 0000000..5f61e2b
--- /dev/null
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+PROG=		ktutil
+SRCS=		ktutil.c add.c change.c copy.c get.c list.c purge.c remove.c \
+		srvconvert.c srvcreate.c \
+		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
+		krb5_err.h heim_err.h
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/lib/sl \
+		-I${KRB5DIR}/admin \
+		-I${ASN1OBJDIR} \
+		-I${.OBJDIR}
+.if defined(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \
+		-L${KADM5COBJDIR} -lkadm5clnt \
+		-ldes -lcrypt -lcom_err -lreadline
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \
+		${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+MAN8=		ktutil.8
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/admin
+
+kadm5/private.h:	kadm5
+	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+
+kadm5/admin.h:	kadm5
+	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+
+kadm5/kadm5_err.h: kadm5 kadm5_err.h
+	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
+
+kadm5:
+	mkdir ${.TARGET}
+
+CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
+CLEANDIRS+=	kadm5