Misc. updates for heimdal-0.4e

9 files changed, 39 insertions, 26 deletions

diff --git a/kerberosV/lib/hdb/Makefile b/kerberosV/lib/hdb/Makefile
index e2e8279a6a3..e88341d820b 100644
--- a/kerberosV/lib/hdb/Makefile
+++ b/kerberosV/lib/hdb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/06/05 10:38:33 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,7 +13,7 @@ NOPIC=
 NOPROFILE=
 
 ASN1_SRC = asn1_Key.c asn1_Event.c asn1_HDBFlags.c asn1_hdb_entry.c \
-        asn1_Salt.c hdb_asn1.h
+        asn1_Salt.c hdb_asn1.h asn1_GENERATION.c
 
 SRCS=	${ASN1_SRC} \
 	keytab.c \
diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile
index 5dca37484be..2cb614109d2 100644
--- a/kerberosV/lib/krb5/Makefile
+++ b/kerberosV/lib/krb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2001/07/31 20:17:25 deraadt Exp $
+# $OpenBSD: Makefile,v 1.19 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,9 +6,10 @@ KRBDEPTH=../..
 LIB=	krb5
 
 INCLUDE_FILES=	${KRB5SRC}/lib/krb5/{krb5.h,krb5-protos.h,krb5-private.h} \
-		${KRB5DIR}/include/krb5-types.h krb5_err.h heim_err.h
+		${KRB5DIR}/include/krb5-types.h \
+		krb5_err.h heim_err.h k524_err.h
 
-includes:	krb5_err.h heim_err.h
+includes:	krb5_err.h heim_err.h k524_err.h
 
 MAN=	krb5.conf.5
 
@@ -138,7 +139,6 @@ MLINKS+=krb5_verify_user.3 krb5_verify_user_lrealm.3
 
 SRCS=	add_et_list.c \
 	addr_families.c \
-	address.c \
 	aname_to_localname.c \
 	appdefault.c \
 	asn1_glue.c \
@@ -228,7 +228,8 @@ SRCS=	add_et_list.c \
 	warn.c \
 	write_message.c \
 	krb5_err.c \
-	heim_err.c
+	heim_err.c \
+	k524_err.c
 
 # These are files in libroken that are needed in libkrb5 to make it independant
 # from libroken.
@@ -237,12 +238,14 @@ SRCS+=	base64.c		\
 	getaddrinfo_hostspec.c	\
 	getarg.c		\
 	get_window_size.c	\
+	getprogname.c \
 	parse_time.c		\
 	parse_units.c		\
 	resolve.c		\
 	roken_gethostby.c	\
 	roken_net_write.c	\
 	roken_net_read.c	\
+	setprogname.c \
 	strupr.c 		\
 	strlwr.c		\
 	strsep_copy.c		\
@@ -253,13 +256,13 @@ SRCS+=	afskrb5.c
 
 # There is a net_write.c and net_read.c both in lib/roken and lib/krb5.
 # This stinks.
-roken_net_write.c:	net_write.c
+roken_net_write.c:	${KRB5SRC}/lib/roken/net_write.c
 	ln -sf ${KRB5SRC}/lib/roken/net_write.c roken_net_write.c
-roken_net_read.c:	net_read.c
+roken_net_read.c:	${KRB5SRC}/lib/roken/net_read.c
 	ln -sf ${KRB5SRC}/lib/roken/net_read.c roken_net_read.c
 
 
-CLEANFILES+=	krb5_err.[ch] heim_err.[ch]
+CLEANFILES+=	krb5_err.[ch] heim_err.[ch] k524_err.[ch]
 
 .PATH:	${KRB5SRC}/lib/krb5 ${KRB5SRC}/lib/roken ${KRB5SRC}/lib/kafs
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/ \
@@ -272,4 +275,7 @@ krb5_err.c krb5_err.h:	${KRB5SRC}/lib/krb5/krb5_err.et
 heim_err.c heim_err.h:	${KRB5SRC}/lib/krb5/heim_err.et
 	compile_et ${KRB5SRC}/lib/krb5/heim_err.et
 
+k524_err.c k524_err.h:	${KRB5SRC}/lib/krb5/k524_err.et
+	compile_et ${KRB5SRC}/lib/krb5/k524_err.et
+
 .include <bsd.lib.mk>
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index fafed33348e..1c497b367bc 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/07/18 20:24:18 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,6 +12,6 @@ NOMAN=
 .PATH:	${KRB5SRC}/lib/kadm5
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lhdb -lkafs
+	-lcom_err -lhdb -lkafs -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile
index be9762b3223..c5b85cb5b7e 100644
--- a/kerberosV/libexec/ipropd-slave/Makefile
+++ b/kerberosV/libexec/ipropd-slave/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/07/18 20:24:18 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -12,6 +12,6 @@ NOMAN=
 .PATH:	${KRB5SRC}/lib/kadm5
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
 LDADD+=	-lhdb -lkadm5srv -lkrb5 -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \
-	-lcom_err -lhdb -lkafs
+	-lcom_err -lhdb -lkafs -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile
index 0b76d6c2680..2f7f2e54032 100644
--- a/kerberosV/libexec/kdc/Makefile
+++ b/kerberosV/libexec/kdc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/09/29 17:45:40 jakob Exp $
+# $OpenBSD: Makefile,v 1.7 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -9,6 +9,7 @@ MAN=	${PROG}.8
 SRCS=	524.c \
 	config.c \
 	connect.c \
+	kaserver.c \
 	kdc_locl.h \
 	kerberos4.c \
 	kerberos5.c \
@@ -18,7 +19,7 @@ SRCS=	524.c \
 	rx.h
 
 .PATH:	${KRB5SRC}/kdc
-CFLAGS+=-I${KRB5SRC}/lib/krb5
+CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc
 LDADD+=	-lhdb -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lkafs -lutil
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/asn1_compile/Makefile b/kerberosV/usr.bin/asn1_compile/Makefile
index cdbd1f03a70..62b9e2488e1 100644
--- a/kerberosV/usr.bin/asn1_compile/Makefile
+++ b/kerberosV/usr.bin/asn1_compile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/11/22 20:37:18 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=	../..
 .include <${.CURDIR}/${KRBDEPTH}/Makefile.inc>
@@ -7,7 +7,7 @@ PROG=	asn1_compile
 NOMAN=
 SRCS=	parse.c lex.l main.c hash.c symbol.c gen.c \
         gen_encode.c gen_decode.c gen_free.c gen_length.c gen_copy.c \
-        gen_glue.c
+        gen_glue.c getprogname.c setprogname.c
 
 CLEANFILES=	parse.[ch] lex.[ch]
 
@@ -19,6 +19,6 @@ CFLAGS+= -I${KRB5SRC}/lib/asn1 -I. -I${KRB5SRC}/lib/roken
 test:
 	echo ${LIBROKEN}
 
-.PATH:	${KRB5SRC}/lib/asn1
+.PATH:	${KRB5SRC}/lib/asn1 ${KRB5SRC}/lib/roken
 
 .include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile
index c363898c24f..56fe595fc6a 100644
--- a/kerberosV/usr.bin/kauth/Makefile
+++ b/kerberosV/usr.bin/kauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/06/23 00:17:46 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,7 +6,7 @@ KRBDEPTH=../..
 PROG=	kauth
 NOMAN=
 
-SRCS=	kinit.c kauth_options.c
+SRCS=	kinit.c
 
 .PATH:	${KRB5SRC}/kuser
 
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index 0946da4ee65..5ce36ad6cb9 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/08/30 10:33:59 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,8 +6,6 @@ KRBDEPTH=../..
 PROG=	kinit
 MLINKS=	kinit.1 kauth.1
 
-SRCS=	kinit.c kinit_options.c
-
 .PATH:	${KRB5SRC}/kuser
 
 LDADD+=	-lkrb5 -ldes -lkafs -l45 -lkrb -lkafs ${LIBROKEN} -lasn1 -lcrypto \
diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile
index 0b64956d546..592be898487 100644
--- a/kerberosV/usr.sbin/ktutil/Makefile
+++ b/kerberosV/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/07/18 20:24:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2002/02/06 09:13:34 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -6,7 +6,15 @@ KRBDEPTH=../..
 PROG=	ktutil
 MAN=	ktutil.8
 
-SRCS=	add.c change.c copy.c get.c ktutil.c list.c purge.c remove.c
+SRCS=	add.c \
+	change.c \
+	copy.c \
+	get.c \
+	ktutil.c \
+	list.c \
+	purge.c \
+	remove.c \
+	rename.c
 
 .PATH:	${KRB5SRC}/admin
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5