Small changes needed for heimdal-0.6rc1

8 files changed, 21 insertions, 20 deletions

diff --git a/kerberosV/lib/45/Makefile b/kerberosV/lib/45/Makefile
index 67a67545012..aad7fb90204 100644
--- a/kerberosV/lib/45/Makefile
+++ b/kerberosV/lib/45/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:18:51 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2003/05/11 03:47:55 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,6 +7,6 @@ LIB=	45
 SRCS=	get_ad_tkt.c mk_req.c
 
 .PATH:	${KRB5SRC}/lib/45
-CFLAGS+=-I${KRB5SRC}/lib/krb5 -I../krb5 -I../asn1
+CFLAGS+=-I${KRB5SRC}/lib/krb5 -I../krb5 -I../asn1 -DROKEN_RENAME
 
-.include <bsd.lib.mk>
\ No newline at end of file
+.include <bsd.lib.mk>
diff --git a/kerberosV/lib/asn1/Makefile b/kerberosV/lib/asn1/Makefile
index 37841562717..2f3e485579d 100644
--- a/kerberosV/lib/asn1/Makefile
+++ b/kerberosV/lib/asn1/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/06/23 00:17:44 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/11 03:47:55 hin Exp $
 
 LIB=	asn1
 
@@ -79,7 +79,7 @@ SRCS=	der_get.c \
 	der_copy.c \
 	${BUILT_SOURCES}
 
-CFLAGS+=	-I${KRB5SRC}/lib/asn1 -I.
+CFLAGS+=	-I${KRB5SRC}/lib/asn1 -I. -DROKEN_RENAME
 
 asn1_err.h asn1_err.c:	${KRB5SRC}/lib/asn1/asn1_err.et
 	compile_et ${KRB5SRC}/lib/asn1/asn1_err.et
diff --git a/kerberosV/lib/gssapi/Makefile b/kerberosV/lib/gssapi/Makefile
index 7e417c997fa..ed7feb89063 100644
--- a/kerberosV/lib/gssapi/Makefile
+++ b/kerberosV/lib/gssapi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/05/25 08:18:53 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2003/05/11 03:47:55 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -17,6 +17,7 @@ SRCS=	8003.c			\
 	add_oid_set_member.c	\
 	canonicalize_name.c	\
 	compare_name.c		\
+	compat.c		\
 	context_time.c		\
 	create_emtpy_oid_set.c	\
 	decapsulate.c		\
@@ -53,6 +54,6 @@ SRCS=	8003.c			\
 .PATH:	${KRB5SRC}/lib/gssapi
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/ \
 	-I${KRB5SRC}/lib/asn1 -I../asn1 -I. \
-	-DSHA1_CTX=SHA_CTX
+	-DSHA1_CTX=SHA_CTX -DROKEN_RENAME
 
-.include <bsd.lib.mk>
\ No newline at end of file
+.include <bsd.lib.mk>
diff --git a/kerberosV/lib/hdb/Makefile b/kerberosV/lib/hdb/Makefile
index e88341d820b..6a6323c7d79 100644
--- a/kerberosV/lib/hdb/Makefile
+++ b/kerberosV/lib/hdb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2002/02/06 09:13:34 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/11 03:47:55 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -33,7 +33,8 @@ ${ASN1_SRC}:	${KRB5SRC}/lib/hdb/hdb.asn1
 CLEANFILES+=	${ASN1_SRC} ${ASN1_SRC:.c=.x} hdb_err.[ch] \
 		hdb_asn1.[ch] ans1_files asn1.h asn1_files
 
-CFLAGS+=-I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1 -I../asn1 -I. -I../krb5
+CFLAGS+=-I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1 -I../asn1 -I. -I../krb5 \
+	-DROKEN_RENAME
 .PATH:	${KRB5SRC}/lib/hdb
 
 hdb_err.c hdb_err.h: ${KRB5SRC}/lib/hdb/hdb_err.et
diff --git a/kerberosV/lib/kadm5clnt/Makefile b/kerberosV/lib/kadm5clnt/Makefile
index e9c1d814a78..9d8e2f3a6f9 100644
--- a/kerberosV/lib/kadm5clnt/Makefile
+++ b/kerberosV/lib/kadm5clnt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/04/07 21:29:45 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/11 03:47:55 hin Exp $
 
 LIB=	kadm5clnt
 
@@ -36,7 +36,7 @@ SRCS=	admin.h         \
 .PATH:	${KRB5SRC}/lib/kadm5
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/asn1 -I../asn1 -I../krb5 \
-	-I${KRB5SRC}/lib/hdb -I../hdb -I.
+	-I${KRB5SRC}/lib/hdb -I../hdb -I. -DROKEN_RENAME
 
 CLEANFILES+=kadm5_err.[ch]
 
diff --git a/kerberosV/lib/kadm5srv/Makefile b/kerberosV/lib/kadm5srv/Makefile
index 50388effded..5a5952b0134 100644
--- a/kerberosV/lib/kadm5srv/Makefile
+++ b/kerberosV/lib/kadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/06/23 00:20:06 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/11 03:47:55 hin Exp $
 
 LIB=	kadm5srv
 
@@ -46,11 +46,11 @@ SRCS=	acl.c           \
 .PATH:	${KRB5SRC}/lib/kadm5
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/asn1 -I../asn1 -I../krb5 \
-	-I${KRB5SRC}/lib/hdb -I../hdb -I.
+	-I${KRB5SRC}/lib/hdb -I../hdb -I. -DROKEN_RENAME
 
 CLEANFILES+=kadm5_err.[ch]
 
 kadm5_err.c kadm5_err.h: ${KRB5SRC}/lib/kadm5/kadm5_err.et
 	compile_et ${KRB5SRC}/lib/kadm5/kadm5_err.et
 
-.include <bsd.lib.mk>
\ No newline at end of file
+.include <bsd.lib.mk>
diff --git a/kerberosV/lib/kafs/Makefile b/kerberosV/lib/kafs/Makefile
index c3cdea823bf..e73b697fb42 100644
--- a/kerberosV/lib/kafs/Makefile
+++ b/kerberosV/lib/kafs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/06/10 18:03:08 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2003/05/11 03:47:55 hin Exp $
 
 LIB	= kafs
 
@@ -7,7 +7,7 @@ KRBDEPTH=../..
 
 INCLUDE_FILES	= ${KRB5SRC}/lib/kafs/kafs.h
 
-CFLAGS += -I${KRB5SRC}/lib/kafs
+CFLAGS += -I${KRB5SRC}/lib/kafs -DROKEN_RENAME
 
 .PATH:	${KRB5SRC}/lib/kafs ${KRB5SRC}/man
 
diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile
index af093416a05..c75d2cb6a6b 100644
--- a/kerberosV/lib/krb5/Makefile
+++ b/kerberosV/lib/krb5/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2002/05/18 16:43:36 deraadt Exp $
+# $OpenBSD: Makefile,v 1.22 2003/05/11 03:47:55 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
+CFLAGS+= -DROKEN_RENAME
 LIB=	krb5
 
 INCLUDE_FILES=	${KRB5SRC}/lib/krb5/{krb5.h,krb5-protos.h,krb5-private.h} \
@@ -238,14 +239,12 @@ 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		\