Update build after import of Heimdal Kerberos 2002/02/17.

18 files changed, 118 insertions, 79 deletions

diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index a72ef17..447a53d 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -143,6 +143,14 @@ kadm5_err.c kadm5_err.h: \
 
 CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et
 
+.ORDER: k524_err.c k524_err.h
+k524_err.c k524_err.h: \
+	${KRB5DIR}/lib/krb5/k524_err.et
+	test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC}
+	${COMPILE_ET} k524_err.et
+
+CLEANFILES+=k524_err.h k524_err.c k524_err.et
+
 .if defined(INCLUDES)
 beforeinstall: ${INCLUDES}
 .for INC in ${INCLUDES}
diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index 05a13d0..a76a7de 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -7,10 +7,10 @@
 #define RCSID(msg) static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #endif
 
-#define BINDIR "/usr/heimdal/bin"
-#define LIBDIR "/usr/heimdal/lib"
-#define LIBEXECDIR "/usr/heimdal/libexec"
-#define SBINDIR "/usr/heimdal/sbin"
+#define BINDIR "/usr/bin"
+#define LIBDIR "/usr/lib"
+#define LIBEXECDIR "/usr/libexec"
+#define SBINDIR "/usr/sbin"
 
 #define HAVE_INT8_T 1
 #define HAVE_INT16_T 1
@@ -127,6 +127,12 @@
 /* Define if you have the `daemon' function. */
 #define HAVE_DAEMON 1
 
+/* define if you have a berkeley db1/2 library */
+#define HAVE_DB1 1
+
+/* define if you have a berkeley db3 library */
+/* #undef HAVE_DB3 */
+
 /* Define if you have the `dbm_firstkey' function. */
 #define HAVE_DBM_FIRSTKEY 1
 
@@ -134,7 +140,7 @@
 /* #undef HAVE_DBM_H */
 
 /* Define if you have the `dbopen' function. */
-/* #undef HAVE_DBOPEN */
+#define HAVE_DBOPEN 1
 
 /* Define if you have the <db_185.h> header file. */
 /* #undef HAVE_DB_185_H */
@@ -145,8 +151,8 @@
 /* Define if you have the <db.h> header file. */
 #define HAVE_DB_H 1
 
-/* Define if you have the `des_cbc_encrypt' function. */
-#define HAVE_DES_CBC_ENCRYPT 1
+/* define if you have ndbm compat in db */
+/* #undef HAVE_DB_NDBM */
 
 /* Define if you have the <dirent.h> header file. */
 #define HAVE_DIRENT_H 1
@@ -160,12 +166,21 @@
 /* Define if you have the `dn_expand' function. */
 #define HAVE_DN_EXPAND 1
 
+/* Define if you have the `ecalloc' function. */
+/* #undef HAVE_ECALLOC */
+
 /* Define if you have the `el_init' function. */
 #define HAVE_EL_INIT 1
 
+/* Define if you have the `emalloc' function. */
+/* #undef HAVE_EMALLOC */
+
 /* define if your system declares environ */
 /* #undef HAVE_ENVIRON_DECLARATION */
 
+/* Define if you have the `erealloc' function. */
+/* #undef HAVE_EREALLOC */
+
 /* Define if you have the `err' function. */
 #define HAVE_ERR 1
 
@@ -178,6 +193,9 @@
 /* Define if you have the <err.h> header file. */
 #define HAVE_ERR_H 1
 
+/* Define if you have the `estrdup' function. */
+/* #undef HAVE_ESTRDUP */
+
 /* Define if you have the `fchown' function. */
 #define HAVE_FCHOWN 1
 
@@ -197,7 +215,7 @@
 #define HAVE_FNMATCH_H 1
 
 /* Define if el_init takes four arguments. */
-/* #undef HAVE_FOUR_VALUED_EL_INIT */
+#define HAVE_FOUR_VALUED_EL_INIT 1
 
 /* define if krb_put_int takes four arguments. */
 #define HAVE_FOUR_VALUED_KRB_PUT_INT 1
@@ -326,6 +344,9 @@
 /* Define if you have the <ifaddrs.h> header file. */
 #define HAVE_IFADDRS_H 1
 
+/* Define if you have the in6addr_loopback variable */
+#define HAVE_IN6ADDR_LOOPBACK 1
+
 /* Define if you have the `inet_aton' function. */
 #define HAVE_INET_ATON 1
 
@@ -356,6 +377,9 @@
 /* Define if you have the `iruserok' function. */
 #define HAVE_IRUSEROK 1
 
+/* Define if you have the `issetugid' function. */
+#define HAVE_ISSETUGID 1
+
 /* Define if you have the `krb_disable_debug' function. */
 #define HAVE_KRB_DISABLE_DEBUG 1
 
@@ -365,9 +389,15 @@
 /* Define if you have the `krb_get_our_ip_for_realm' function. */
 #define HAVE_KRB_GET_OUR_IP_FOR_REALM 1
 
+/* Define if you have the <libutil.h> header file. */
+#define HAVE_LIBUTIL_H 1
+
 /* Define if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
+/* Define if you have the `logout' function. */
+#define HAVE_LOGOUT 1
+
 /* Define if you have the `logwtmp' function. */
 #define HAVE_LOGWTMP 1
 
@@ -380,21 +410,21 @@
 /* Define if you have the <maillock.h> header file. */
 /* #undef HAVE_MAILLOCK_H */
 
-/* Define if you have the `MD4_Init' function. */
-#define HAVE_MD4_INIT 1
-
-/* Define if you have the `MD5_Init' function. */
-#define HAVE_MD5_INIT 1
-
 /* Define if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
 /* Define if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 
 /* Define if you have the `mktime' function. */
 #define HAVE_MKTIME 1
 
+/* define if you have a ndbm library */
+#define HAVE_NDBM 1
+
 /* Define if you have the <ndbm.h> header file. */
 #define HAVE_NDBM_H 1
 
@@ -437,20 +467,11 @@
 /* Define if you have the <net/if.h> header file. */
 #define HAVE_NET_IF_H 1
 
-/* Define if you have the <openssl/des.h> header file. */
-#define HAVE_OPENSSL_DES_H 1
-
-/* Define if you have the <openssl/md4.h> header file. */
-#define HAVE_OPENSSL_MD4_H 1
-
-/* Define if you have the <openssl/md5.h> header file. */
-#define HAVE_OPENSSL_MD5_H 1
-
-/* Define if you have the <openssl/rc4.h> header file. */
-#define HAVE_OPENSSL_RC4_H 1
+/* Define if you have the `openpty' function. */
+#define HAVE_OPENPTY 1
 
-/* Define if you have the <openssl/sha.h> header file. */
-#define HAVE_OPENSSL_SHA_H 1
+/* define to use openssl's libcrypto */
+#define HAVE_OPENSSL 1
 
 /* define if your system declares optarg */
 #define HAVE_OPTARG_DECLARATION 1
@@ -494,9 +515,6 @@
 /* Define if you have the `random' function. */
 #define HAVE_RANDOM 1
 
-/* Define if you have the `RC4' function. */
-#define HAVE_RC4 1
-
 /* Define if you have the `rcmd' function. */
 #define HAVE_RCMD 1
 
@@ -518,9 +536,6 @@
 /* Define if you have the `revoke' function. */
 #define HAVE_REVOKE 1
 
-/* Define if you have the <rpcsvc/dbm.h> header file. */
-/* #undef HAVE_RPCSVC_DBM_H */
-
 /* Define if you have the <rpcsvc/ypclnt.h> header file. */
 #define HAVE_RPCSVC_YPCLNT_H 1
 
@@ -599,9 +614,6 @@
 /* Define if you have the <sgtty.h> header file. */
 #define HAVE_SGTTY_H 1
 
-/* Define if you have the `SHA1_Init' function. */
-#define HAVE_SHA1_INIT 1
-
 /* Define if you have the <shadow.h> header file. */
 /* #undef HAVE_SHADOW_H */
 
@@ -626,6 +638,12 @@
 /* Define if you have the <standards.h> header file. */
 /* #undef HAVE_STANDARDS_H */
 
+/* Define if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
 /* Define if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1
 
@@ -638,6 +656,12 @@
 /* Define if you have the `strftime' function. */
 #define HAVE_STRFTIME 1
 
+/* Define if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
 /* Define if you have the `strlcat' function. */
 #define HAVE_STRLCAT 1
 
@@ -968,9 +992,6 @@
 /* Define if you have the `warnx' function. */
 #define HAVE_WARNX 1
 
-/* Define if you have the <winsock.h> header file. */
-/* #undef HAVE_WINSOCK_H */
-
 /* Define if you have the `writev' function. */
 #define HAVE_WRITEV 1
 
@@ -1010,12 +1031,6 @@
 /* Define if you have the hesiod package. */
 /* #undef HESIOD */
 
-/* Define if you want to use the KDC as a kaserver. */
-/* #undef KASERVER */
-
-/* Define if you want support in hprop for reading kaserver databases */
-/* #undef KASERVER_DB */
-
 /* Enable Kerberos 5 support in applications. */
 #define KRB5 1
 
@@ -1126,7 +1141,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.3f"
+#define VERSION "0.4e"
 
 /* Define if signal handlers return void. */
 #define VOID_RETSIGTYPE 1
@@ -1201,15 +1216,15 @@
 #define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y))
 #endif
 
-#define BINDIR "/usr/heimdal/bin"
-#define LIBDIR "/usr/heimdal/lib"
-#define LIBEXECDIR "/usr/heimdal/libexec"
-#define SBINDIR "/usr/heimdal/sbin"
+#define BINDIR "/usr/bin"
+#define LIBDIR "/usr/lib"
+#define LIBEXECDIR "/usr/libexec"
+#define SBINDIR "/usr/sbin"
 
-#define BINDIR "/usr/heimdal/bin"
-#define LIBDIR "/usr/heimdal/lib"
-#define LIBEXECDIR "/usr/heimdal/libexec"
-#define SBINDIR "/usr/heimdal/sbin"
+#define BINDIR "/usr/bin"
+#define LIBDIR "/usr/lib"
+#define LIBEXECDIR "/usr/libexec"
+#define SBINDIR "/usr/sbin"
 
 #define HAVE_INT8_T 1
 #define HAVE_INT16_T 1
@@ -1254,14 +1269,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #define SGTTY
 #endif
 
-/*
- * Define NDBM if you are using the 4.3 ndbm library (which is part of
- * libc).  If not defined, 4.2 dbm will be assumed.
- */
-#if defined(HAVE_DBM_FIRSTKEY)
-#define NDBM
-#endif
-
 /* telnet stuff ----------------------------------------------- */
 
 #if defined(ENCRYPTION) && !defined(AUTHENTICATION)
@@ -1304,3 +1311,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #  define WORDS_BIGENDIAN 1
 #  endif
 #endif
+
+#ifdef ROKEN_RENAME
+#include "roken_rename.h"
+#endif
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index bc71dad..7e0313d 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -94,6 +94,7 @@ asn1_compile:					\
 	gen_glue.c				\
 	gen_length.c				\
 	hash.c					\
+	emalloc.c				\
 	lex.o					\
 	main.c					\
 	parse.o					\
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index 86878e4..bf7902e 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -50,10 +50,10 @@ SRCS=				\
         wrap.c                  \
         address_to_krb5addr.c
 
-INCLUDES=${KRB5DIR}/lib/gssapi/gssapi.h heim_err.h krb5_err.h
+INCLUDES=${KRB5DIR}/lib/gssapi/gssapi.h heim_err.h krb5_err.h k524_err.h
 
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/gssapi
 
-beforedepend all:	heim_err.h krb5_err.h
+beforedepend all:	heim_err.h krb5_err.h k524_err.h
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index c4c9c65..d30559b 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -23,12 +23,14 @@ SRCS=	\
 	hdb_err.c				\
 	hdb_err.h				\
 	hdb_asn1.h				\
+	k524_err.h				\
 	krb5_err.h				\
 	heim_err.h				\
 	${GEN:S/.x/.c/g}
 
 GEN=						\
 	asn1_Key.x				\
+	asn1_GENERATION.x			\
 	asn1_Event.x				\
 	asn1_HDBFlags.x				\
 	asn1_hdb_entry.x			\
@@ -53,7 +55,7 @@ CLEANFILES+=	${GEN:S/.x/.c/g} hdb_asn1.h asn1_files
 ${GEN} hdb_asn1.h:	asn1_compile hdb.asn1
 	./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1
 
-asn1_compile:	parse.o lex.o main.c hash.c symbol.c gen.c \
+asn1_compile:	parse.o lex.o main.c hash.c symbol.c emalloc.c gen.c \
 		gen_encode.c gen_decode.c gen_free.c gen_length.c \
 		gen_copy.c gen_glue.c getarg.c warnerr.c print_version.o \
 		get_window_size.c strupr.c
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index c0659a8..3c347aa 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -16,7 +16,6 @@ SRCS=	\
 	acl.c \
 	add_et_list.c \
 	addr_families.c \
-	address.c \
 	aname_to_localname.c \
 	appdefault.c \
 	asn1_glue.c \
@@ -108,26 +107,39 @@ SRCS=	\
 	warn.c \
 	write_message.c \
 	krb5_err.c \
+	k524_err.c \
+	k524_err.h \
 	heim_err.c \
 	heim_err.h
 
 INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
-	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h 
+	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h k524_err.h
 
 MAN3=						\
+	krb5.3					\
 	krb5_425_conv_principal.3		\
 	krb5_appdefault.3			\
 	krb5_auth_context.3			\
 	krb5_build_principal.3			\
 	krb5_config.3				\
 	krb5_context.3				\
+	krb5_create_checksum.3			\
+	krb5_crypto_init.3			\
+	krb5_encrypt.3				\
+	krb5_free_addresses.3			\
 	krb5_free_principal.3			\
+	krb5_get_all_client_addrs.3		\
+	krb5_get_krbhst.3			\
 	krb5_init_context.3			\
 	krb5_keytab.3				\
+	krb5_krbhst_init.3			\
 	krb5_openlog.3				\
 	krb5_parse_name.3			\
+	krb5_principal_get_realm.3		\
 	krb5_sname_to_principal.3		\
+	krb5_timeofday.3			\
 	krb5_unparse_name.3			\
+	krb5_verify_user.3			\
 	krb5_warn.3
 
 MAN5=						\
@@ -142,4 +154,4 @@ MAN8=						\
 .PATH:		${KRB5DIR}/lib/krb5
 .PATH:		${KRB5DIR}/lib/des
 
-beforedepend all:	asn1_err.h krb5_err.h
+beforedepend all:	asn1_err.h krb5_err.h k524_err.h
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 7135111..7311f97 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -10,6 +10,7 @@ SRCS=		\
 	base64.c		\
 	bswap.c			\
 	concat.c		\
+	ecalloc.c		\
 	emalloc.c		\
 	environment.c		\
 	eread.c			\
@@ -22,6 +23,7 @@ SRCS=		\
 	get_window_size.c	\
 	getarg.c		\
 	getnameinfo_verified.c	\
+	hostent_find_fqdn.c	\
 	issuid.c		\
 	k_getpwnam.c		\
 	k_getpwuid.c		\
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
index 2e68fe0..c504e83 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5destroy
-SRCS=		kdestroy.c krb5_err.h heim_err.h
+SRCS=		kdestroy.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
index 8ecf26d..9664d5d 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PROG=		k5init
-SRCS=		kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
+SRCS=		kinit.c asn1_err.h krb5_err.h heim_err.h \
+       		k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
index e25db7d..3e26057 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5list
-SRCS=		klist.c krb5_err.h heim_err.h
+SRCS=		klist.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
index 7441b87..50f4400 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5passwd
-SRCS=		kpasswd.c krb5_err.h heim_err.h
+SRCS=		kpasswd.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/krb5 \
diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile
index 7e8c24c..0ec6314 100644
--- a/kerberos5/usr.bin/k5su/Makefile
+++ b/kerberos5/usr.bin/k5su/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5su
-SRCS=		su.c asn1_err.h krb5_err.h heim_err.h
+SRCS=		su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 2e68fe0..c504e83 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5destroy
-SRCS=		kdestroy.c krb5_err.h heim_err.h
+SRCS=		kdestroy.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 8ecf26d..9664d5d 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PROG=		k5init
-SRCS=		kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
+SRCS=		kinit.c asn1_err.h krb5_err.h heim_err.h \
+       		k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index e25db7d..3e26057 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5list
-SRCS=		klist.c krb5_err.h heim_err.h
+SRCS=		klist.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 7441b87..50f4400 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5passwd
-SRCS=		kpasswd.c krb5_err.h heim_err.h
+SRCS=		kpasswd.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/krb5 \
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 7e8c24c..0ec6314 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		k5su
-SRCS=		su.c asn1_err.h krb5_err.h heim_err.h
+SRCS=		su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/kafs \
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index c1d6a03..d4976e0 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -10,10 +10,11 @@ SRCS=		\
 		list.c				\
 		purge.c				\
 		remove.c			\
+		rename.c \
 		kadm5/private.h \
 		kadm5/admin.h \
 		kadm5/kadm5_err.h \
-		krb5_err.h heim_err.h
+		krb5_err.h heim_err.h k524_err.h
 
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \