r9221: Try to merge Heimdal across from lorikeet-heimdal to samba4.

This is my first attempt at this, so there may be a few rough edges.

Andrew Bartlett
(This used to be commit 9a1d2f2fec67930975da856a2d365345cec46216)

3 files changed, 16 insertions, 9 deletions

diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index 962aadfdad..11e6bad706 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -7,18 +7,22 @@ use File::Basename;
 
 my $file = shift;
 my $prefix = shift;
+my $options = shift;
 my $x_file, @x_files;
 my $c_file, @c_files;
 if (not defined ($prefix)) { $prefix = "asn1"; }
 
 $dirname = dirname($file);
 $basename = basename($file);
+if (not defined $options) {
+    $options = "";
+}
 
 my $header = "$dirname/$prefix.h";
 
 print "$header: $file bin/asn1_compile\n";
 print "\t\@echo \"Compiling ASN1 file $file\"\n";
-print "\t\@cd $dirname && ../../../bin/asn1_compile $basename $prefix\n\n";
+print "\t\@cd $dirname && ../../../bin/asn1_compile $options $basename $prefix\n\n";
 
 open(IN,$file) or die("Can't open $file: $!");
 foreach(<IN>) {
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 0eb8316d1a..6e8882ed11 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -53,6 +53,7 @@ ADD_OBJ_FILES = \
 	heimdal/lib/gssapi/asn1_ContextFlags.o \
 	heimdal/lib/gssapi/asn1_MechType.o \
 	heimdal/lib/gssapi/asn1_MechTypeList.o \
+	heimdal/lib/gssapi/asn1_NegotiationToken.o \
 	heimdal/lib/gssapi/asn1_NegTokenInit.o \
 	heimdal/lib/gssapi/asn1_NegTokenTarg.o \
 	heimdal/lib/gssapi/8003.o \
@@ -236,8 +237,9 @@ ADD_OBJ_FILES = \
 	heimdal/lib/asn1/asn1_Ticket.o \
 	heimdal/lib/asn1/asn1_TicketFlags.o \
 	heimdal/lib/asn1/asn1_TransitedEncoding.o \
-	heimdal/lib/asn1/asn1_UNSIGNED.o \
-	heimdal/lib/asn1/asn1_err.o
+	heimdal/lib/asn1/asn1_err.o \
+	heimdal/lib/asn1/asn1_krb5int32.o \
+	heimdal/lib/asn1/asn1_krb5uint32.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
@@ -357,6 +359,8 @@ ADD_OBJ_FILES = \
 	heimdal/lib/roken/strupr.o \
 	heimdal/lib/roken/getprogname.o \
 	heimdal/lib/roken/get_window_size.o \
+	heimdal/lib/roken/estrdup.o \
+	heimdal/lib/roken/ecalloc.o \
 	heimdal/lib/asn1/symbol.o \
 	heimdal_build/replace.o
 NOPROTO = YES
@@ -403,7 +407,7 @@ heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
 
 include ./heimdal_build/asn1_deps.pl heimdal/lib/hdb/hdb.asn1 hdb_asn1|
 include ./heimdal_build/asn1_deps.pl heimdal/lib/gssapi/spnego.asn1 spnego_asn1|
-include ./heimdal_build/asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1|
+include ./heimdal_build/asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1 --encode-rfc1510-bit-string|
 
 include ./heimdal_build/et_deps.pl heimdal/lib/asn1/asn1_err.et|
 include ./heimdal_build/et_deps.pl heimdal/lib/hdb/hdb_err.et|
@@ -423,11 +427,7 @@ heimdal_basics: \
 	heimdal/lib/krb5/k524_err.h \
 	heimdal/lib/krb5/krb5_err.h
 
-heimdal_clean:
-	@echo Removing generated ASN1 files
-	@-find heimdal/lib/asn1 -name 'asn1_*.[cx]' -exec rm -f '{}' \;
-	@-find heimdal/lib/gssapi -name 'asn1_*.[c]' -exec rm -f '{}' \;
-	@-find heimdal/lib/hdb -name 'asn1_*.[c]' -exec rm -f '{}' \;
+heimdal_clean:	hdb_asn1_clean spnego_asn1_clean krb5_asn1_clean
 	@-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h
 	@-rm -f heimdal/lib/hdb/hdb_asn1.h
 	@-rm -f heimdal/lib/gssapi/spnego_asn1.h
diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h
index 532e9103df..ac8296c5ae 100644
--- a/source4/heimdal_build/krb5-types.h
+++ b/source4/heimdal_build/krb5-types.h
@@ -3,6 +3,9 @@
 
 #ifndef __krb5_types_h__
 #define __krb5_types_h__
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #if HAVE_INTTYPES_H
 #include <inttypes.h>