s4:heimdal New files and supporting logic for heimdal update

5 files changed, 30 insertions, 2 deletions

diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index b71abc72c5..26be254f14 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -23,6 +23,8 @@ if (not defined $options) {
 
 my $header = "$dirname/$prefix.h";
 my $headerx = "$dirname/$prefix.hx";
+my $headerpriv = "$dirname/$prefix-priv.h";
+my $headerprivx = "$dirname/$prefix-priv.hx";
 my $o_file = "$dirname/asn1_$prefix.o";
 my $c_file = "$dirname/asn1_$prefix.c";
 my $x_file = "$dirname/asn1_$prefix.x";
@@ -35,7 +37,9 @@ print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname
 print "$headerx: $output_file\n";
 print "$header: $headerx\n";
 print "\t\@cp $headerx $header\n";
-print "$x_file: $header\n";
+print "$headerpriv: $headerprivx\n";
+print "\t\@cp $headerprivx $headerpriv\n";
+print "$x_file: $header $headerpriv\n";
 print "$c_file: $x_file\n";
 print "\t\@echo \"#include \\\"config.h\\\"\" > $c_file && cat $x_file >> $c_file\n\n";
 
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index be544cb83b..45cc02b2a0 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -6,6 +6,10 @@
 #ifndef HAVE_HEIMDAL_CONFIG_H
 #define HAVE_HEIMDAL_CONFIG_H
 
+#ifndef HAVE_STRERROR_R
+#define HAVE_STRERROR_R
+#endif
+
 #include "include/config.h"
 #include "../replace/replace.h"
 
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 843bb858a3..6c6bfcec65 100644
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -91,6 +91,7 @@ HEIMDAL_HDB_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/hdb/hdb.o \
 	$(heimdalsrcdir)/lib/hdb/ext.o \
 	$(heimdalsrcdir)/lib/hdb/keytab.o \
+	$(heimdalsrcdir)/lib/hdb/hdb-keytab.o \
 	$(heimdalsrcdir)/lib/hdb/mkey.o \
 	$(heimdalsrcdir)/lib/hdb/ndbm.o \
 	$(heimdalsrcdir)/lib/hdb/hdb_err.o \
@@ -110,6 +111,8 @@ $(eval $(call heimdal_proto_header_template, \
   $(HEIMDAL_HDB_OBJ_FILES) $(HEIMDAL_HDB_OBJ_FILES:.o=.d) \
 ))
 
+basics:: $(heimdalsrcdir)/lib/hdb/hdb-protos.h $(heimdalsrcdir)/lib/hdb/hdb-private.h
+
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
@@ -637,6 +640,7 @@ HEIMDAL_ROKEN_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/roken/erealloc.o \
 	$(heimdalsrcdir)/lib/roken/simple_exec.o \
 	$(heimdalsrcdir)/lib/roken/strcollect.o \
+	$(heimdalsrcdir)/lib/roken/strerror_r.o \
 	$(heimdalsrcdir)/lib/roken/rtbl.o \
 	$(heimdalsrcdir)/lib/roken/cloexec.o \
 	$(heimdalsrcdir)/lib/roken/xfree.o \
@@ -692,6 +696,7 @@ asn1_compile_ASN1_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/asn1/gen_glue.ho \
 	$(heimdalsrcdir)/lib/asn1/gen_length.ho \
 	$(heimdalsrcdir)/lib/asn1/gen_seq.ho \
+	$(heimdalsrcdir)/lib/asn1/gen_template.ho \
 	$(heimdalsrcdir)/lib/asn1/hash.ho \
 	$(heimdalsrcdir)/lib/asn1/symbol.ho \
 	$(heimdalsrcdir)/lib/asn1/asn1parse.ho \
@@ -705,6 +710,7 @@ asn1_compile_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/vers/print_version.ho
 
 $(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
+basics::  $(heimdalsrcdir)/lib/asn1/der-protos.h $(heimdalsrcdir)/lib/asn1/der-private.h
 
 $(eval $(call heimdal_proto_header_template, \
   $(heimdalsrcdir)/lib/asn1/der-protos.h, \
@@ -713,6 +719,13 @@ $(eval $(call heimdal_proto_header_template, \
   $(asn1_compile_ASN1_OBJ_FILES) $(asn1_compile_ASN1_OBJ_FILES:.ho=.hd) \
 ))
 
+$(eval $(call heimdal_proto_header_template, \
+  $(heimdalsrcdir)/lib/asn1/der-private.h, \
+  -q -P comment -p, \
+  $(HEIMDAL_HEIM_ASN1_DER_OBJ_FILES:.o=.c), \
+  $(asn1_compile_ASN1_OBJ_FILES) $(asn1_compile_ASN1_OBJ_FILES:.ho=.hd) \
+))
+
 # End BINARY asn1_compile
 #######################
 
diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h
index cdc5a3cba9..4f55a80a58 100644
--- a/source4/heimdal_build/krb5-types.h
+++ b/source4/heimdal_build/krb5-types.h
@@ -8,6 +8,7 @@
 #include "system/network.h"
 
 typedef socklen_t krb5_socklen_t;
+typedef int krb5_socket_t;
 typedef ssize_t krb5_ssize_t;
 
 #endif /* __krb5_types_h__ */
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 2d46767e1b..c95e6dfaef 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -10,6 +10,8 @@
 /* path to sysconf - should we force this to samba LIBDIR ? */
 #define SYSCONFDIR "/etc"
 
+#define rk_PATH_DELIM '/'
+
 /* HDB module dir - set to Samba LIBDIR/hdb ? */
 #define HDBDIR "/usr/heimdal/lib"
 #define LIBDIR "/usr/heimdal/lib"
@@ -27,7 +29,7 @@
 #define VERSION "Samba"
 
 #define ROKEN_LIB_FUNCTION
-
+#define ROKEN_LIB_CALL
 #define GETHOSTBYADDR_PROTO_COMPATIBLE
 #define GETSERVBYNAME_PROTO_COMPATIBLE
 #define OPENLOG_PROTO_COMPATIBLE
@@ -105,6 +107,10 @@
 #define HAVE_INET_ATON
 #endif
 
+#ifndef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY
+#endif
+
 /* we lie about having pidfile() so that NetBSD5 can compile. Nothing
    in the parts of heimdal we use actually uses pidfile(), and we
    don't use it in Samba, so this works, although its ugly */