From 9b261c008a395a323e0516f4cd3f3134aa050577 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 8 Jun 2009 19:06:16 +1000 Subject: s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e892ff34b6865ba) Also including the supporting changes required to pass make test A number of heimdal functions and constants have changed since we last imported a tree (for the better, but inconvenient for us). Andrew Bartlett --- source4/heimdal_build/asn1_deps.pl | 5 ++++- source4/heimdal_build/internal.mk | 15 +++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl index 6c4d10d262..9da0787012 100755 --- a/source4/heimdal_build/asn1_deps.pl +++ b/source4/heimdal_build/asn1_deps.pl @@ -28,9 +28,12 @@ if (not defined $options) { } my $header = "$dirname/$prefix.h"; +my $headerx = "$dirname/$prefix.hx"; print "basics:: $header\n"; -print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n"; +print "$header: $headerx\n"; +print "\t\@cp $headerx $header\n"; +print "$headerx: \$(heimdalsrcdir)/$file \$(ASN1C)\n"; print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n"; print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(call abspath,\$(heimdalsrcdir)/$file) $prefix $options\n\n"; diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index ea8d4731db..d3b7264c2c 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -36,8 +36,6 @@ HEIMDAL_KDC_OBJ_FILES = \ $(heimdalsrcdir)/kdc/pkinit.o \ $(heimdalsrcdir)/kdc/log.o \ $(heimdalsrcdir)/kdc/misc.o \ - $(heimdalsrcdir)/kdc/524.o \ - $(heimdalsrcdir)/kdc/kerberos4.o \ $(heimdalsrcdir)/kdc/kaserver.o \ $(heimdalsrcdir)/kdc/digest.o \ $(heimdalsrcdir)/kdc/process.o \ @@ -179,7 +177,8 @@ HEIMDAL_GSSAPI_KRB5_OBJ_FILES = \ $(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \ $(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \ $(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/prf.o + $(heimdalsrcdir)/lib/gssapi/krb5/prf.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/aeap.o $(eval $(call heimdal_proto_header_template, \ $(heimdalsrcdir)/lib/gssapi/krb5/gsskrb5-private.h, \ @@ -196,6 +195,7 @@ HEIMDAL_GSSAPI_OBJ_FILES = \ $(heimdalsrcdir)/lib/gssapi/mech/gss_mech_switch.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_process_context_token.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_buffer_set.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_aeap.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_add_cred.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_add_oid_set_member.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_compare_name.o \ @@ -273,7 +273,6 @@ HEIMDAL_KRB5_OBJ_FILES = \ $(heimdalsrcdir)/lib/krb5/changepw.o \ $(heimdalsrcdir)/lib/krb5/codec.o \ $(heimdalsrcdir)/lib/krb5/config_file.o \ - $(heimdalsrcdir)/lib/krb5/config_file_netinfo.o \ $(heimdalsrcdir)/lib/krb5/constants.o \ $(heimdalsrcdir)/lib/krb5/context.o \ $(heimdalsrcdir)/lib/krb5/convert_creds.o \ @@ -297,7 +296,6 @@ HEIMDAL_KRB5_OBJ_FILES = \ $(heimdalsrcdir)/lib/krb5/get_for_creds.o \ $(heimdalsrcdir)/lib/krb5/get_host_realm.o \ $(heimdalsrcdir)/lib/krb5/get_in_tkt.o \ - $(heimdalsrcdir)/lib/krb5/get_in_tkt_with_keytab.o \ $(heimdalsrcdir)/lib/krb5/get_port.o \ $(heimdalsrcdir)/lib/krb5/init_creds.o \ $(heimdalsrcdir)/lib/krb5/init_creds_pw.o \ @@ -595,7 +593,7 @@ $(HEIMDAL_ROKEN_CLOSEFROM_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heim ####################### # Start SUBSYSTEM HEIMDAL_ROKEN [SUBSYSTEM::HEIMDAL_ROKEN] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/include -I$(socketwrappersrcdir) PRIVATE_DEPENDENCIES = \ HEIMDAL_ROKEN_PROGNAME \ HEIMDAL_ROKEN_CLOSEFROM \ @@ -613,6 +611,7 @@ HEIMDAL_ROKEN_OBJ_FILES = \ $(heimdalsrcdir)/lib/roken/ecalloc.o \ $(heimdalsrcdir)/lib/roken/getarg.o \ $(heimdalsrcdir)/lib/roken/get_window_size.o \ + $(heimdalsrcdir)/lib/roken/getdtablesize.o \ $(heimdalsrcdir)/lib/roken/h_errno.o \ $(heimdalsrcdir)/lib/roken/issuid.o \ $(heimdalsrcdir)/lib/roken/net_read.o \ @@ -735,14 +734,14 @@ dist:: $(heimdalsrcdir)/lib/com_err/lex.c mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb | mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList | mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/mech/gssapi.asn1 gssapi_asn1 \$\(heimdalsrcdir\)/lib/gssapi| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/k5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/krb5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --option-file=krb5.opt| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/digest.asn1 digest_asn1 \$\(heimdalsrcdir\)/lib/asn1| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs8.asn1 pkcs8_asn1 \$\(heimdalsrcdir\)/lib/asn1| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs9.asn1 pkcs9_asn1 \$\(heimdalsrcdir\)/lib/asn1| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs12.asn1 pkcs12_asn1 \$\(heimdalsrcdir\)/lib/asn1| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/rfc2459.asn1 rfc2459_asn1 \$\(heimdalsrcdir\)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkinit.asn1 pkinit_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/CMS.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/cms.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1 --option-file=cms.opt| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1| mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo| -- cgit