Update build infrastructure after import of Heimdal Kerberos 2002/08/29.

kerberos5/include/krb5-private.h

@@ -4,58 +4,48 @@
 
 /* $FreeBSD$ */
 
-#ifdef __STDC__
 #include <stdarg.h>
-#ifndef __P
-#define __P(x) x
-#endif
-#else
-#ifndef __P
-#define __P(x) ()
-#endif
-#endif
-
 void
-_krb5_crc_init_table __P((void));
+_krb5_crc_init_table (void);
 
 u_int32_t
-_krb5_crc_update __P((
-	const char *p,
-	size_t len,
-	u_int32_t res));
+_krb5_crc_update (
+	const char */*p*/,
+	size_t /*len*/,
+	u_int32_t /*res*/);
 
 int
-_krb5_extract_ticket __P((
-	krb5_context context,
-	krb5_kdc_rep *rep,
-	krb5_creds *creds,
-	krb5_keyblock *key,
-	krb5_const_pointer keyseed,
-	krb5_key_usage key_usage,
-	krb5_addresses *addrs,
-	unsigned nonce,
-	krb5_boolean allow_server_mismatch,
-	krb5_boolean ignore_cname,
-	krb5_decrypt_proc decrypt_proc,
-	krb5_const_pointer decryptarg));
+_krb5_extract_ticket (
+	krb5_context /*context*/,
+	krb5_kdc_rep */*rep*/,
+	krb5_creds */*creds*/,
+	krb5_keyblock */*key*/,
+	krb5_const_pointer /*keyseed*/,
+	krb5_key_usage /*key_usage*/,
+	krb5_addresses */*addrs*/,
+	unsigned /*nonce*/,
+	krb5_boolean /*allow_server_mismatch*/,
+	krb5_boolean /*ignore_cname*/,
+	krb5_decrypt_proc /*decrypt_proc*/,
+	krb5_const_pointer /*decryptarg*/);
 
-ssize_t
-_krb5_get_int __P((
-	void *buffer,
-	unsigned long *value,
-	size_t size));
+krb5_ssize_t
+_krb5_get_int (
+	void */*buffer*/,
+	unsigned long */*value*/,
+	size_t /*size*/);
 
 void
-_krb5_n_fold __P((
-	const void *str,
-	size_t len,
-	void *key,
-	size_t size));
+_krb5_n_fold (
+	const void */*str*/,
+	size_t /*len*/,
+	void */*key*/,
+	size_t /*size*/);
 
-ssize_t
-_krb5_put_int __P((
-	void *buffer,
-	unsigned long value,
-	size_t size));
+krb5_ssize_t
+_krb5_put_int (
+	void */*buffer*/,
+	unsigned long /*value*/,
+	size_t /*size*/);
 
 #endif /* __krb5_private_h__ */

kerberos5/include/krb5-types.h

@@ -1,12 +1,17 @@
 /* krb5-types.h -- this file was generated for i386-unknown-freebsd5.0 by
-                   $Id: bits.c,v 1.18 2000/08/27 05:42:46 assar Exp $ */
+                   $Id: bits.c,v 1.22 2002/08/28 16:08:44 joda Exp $ */
 
 /* $FreeBSD$ */
 
 #ifndef __krb5_types_h__
 #define __krb5_types_h__
 
-#include <sys/types.h>
 #include <inttypes.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+typedef socklen_t krb5_socklen_t;
+#include <unistd.h>
+typedef ssize_t krb5_ssize_t;
 
 #endif /* __krb5_types_h__ */

kerberos5/include/version.h

@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
 const char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $";
 const char *krb4_version = "krb4-1.0.5";
-const char *heimdal_long_version = "@(#)$Version: heimdal-0.4e (FreeBSD) $";
-const char *heimdal_version = "heimdal-0.4e";
+const char *heimdal_long_version = "@(#)$Version: Heimdal 0.4f (FreeBSD) $";
+const char *heimdal_version = "Heimdal 0.4f";

kerberos5/lib/Makefile.inc

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIB_MAJOR?=	5
+SHLIB_MAJOR?=	6
 SHLIB_MINOR?=	0
 
 .include "../Makefile.inc"

kerberos5/lib/libroken/Makefile

@@ -28,6 +28,7 @@ SRCS=		\
 	k_getpwnam.c		\
 	k_getpwuid.c		\
 	mini_inetd.c		\
+	ndbm_wrap.c		\
 	net_read.c		\
 	net_write.c		\
 	parse_bytes.c		\

kerberos5/libexec/k5passwdd/Makefile

@@ -2,7 +2,7 @@
 
 PROG=		k5passwdd
 SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
-		kadm5/admin.h
+		kadm5/admin.h kadm5/private.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/hdb \
@@ -33,8 +33,11 @@ MAN=		kpasswdd.8
 kadm5/admin.h:	kadm5
 	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
 
+kadm5/private.h: kadm5
+	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+
 kadm5:
 	mkdir ${.TARGET}
 
-CLEANFILES+=	kadm5/admin.h
+CLEANFILES+=	kadm5/admin.h kadm5/private.h
 CLEANDIRS+=	kadm5

kerberos5/libexec/kpasswdd/Makefile

@@ -2,7 +2,7 @@
 
 PROG=		k5passwdd
 SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
-		kadm5/admin.h
+		kadm5/admin.h kadm5/private.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/hdb \
@@ -33,8 +33,11 @@ MAN=		kpasswdd.8
 kadm5/admin.h:	kadm5
 	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
 
+kadm5/private.h: kadm5
+	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+
 kadm5:
 	mkdir ${.TARGET}
 
-CLEANFILES+=	kadm5/admin.h
+CLEANFILES+=	kadm5/admin.h kadm5/private.h
 CLEANDIRS+=	kadm5