diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-11-13 03:19:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:31 -0500 |
| commit | 5a6288f45891be30bd8e22978f61faf487214de6 (patch) | |
| tree | b0eeb8a90125bc818ab6057a025da67facec916d /source4/heimdal_build | |
| parent | 9d7856122e9ddd1b87ff68215669bff3c28bcafd (diff) | |
| download | samba-5a6288f45891be30bd8e22978f61faf487214de6.tar.gz samba-5a6288f45891be30bd8e22978f61faf487214de6.tar.bz2 samba-5a6288f45891be30bd8e22978f61faf487214de6.zip | |
r19681: Update to current lorikeet-heimdal. I'm looking at using the realm
lookup plugin, the new PAC validation code as well as Heimdal's SPNEGO
implementation.
Andrew Bartlett
(This used to be commit 05421f45ed7811697ea491e26c9d991a7faa1a64)
Diffstat (limited to 'source4/heimdal_build')
| -rw-r--r-- | source4/heimdal_build/config.mk | 13 | ||||
| -rwxr-xr-x | source4/heimdal_build/et_deps.pl | 8 | ||||
| -rw-r--r-- | source4/heimdal_build/roken.h | 1 |
3 files changed, 13 insertions, 9 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index fd3c60b670..f997fa3f38 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -251,6 +251,7 @@ OBJ_FILES = \ ../heimdal/lib/krb5/n-fold.o \ ../heimdal/lib/krb5/padata.o \ ../heimdal/lib/krb5/pkinit.o \ + ../heimdal/lib/krb5/plugin.o \ ../heimdal/lib/krb5/principal.o \ ../heimdal/lib/krb5/rd_cred.o \ ../heimdal/lib/krb5/rd_error.o \ @@ -427,6 +428,7 @@ OBJ_FILES = \ ../heimdal/lib/roken/issuid.o \ ../heimdal/lib/roken/net_read.o \ ../heimdal/lib/roken/net_write.o \ + ../heimdal/lib/roken/socket.o \ ../heimdal/lib/roken/parse_time.o \ ../heimdal/lib/roken/parse_units.o \ ../heimdal/lib/roken/resolve.o \ @@ -542,11 +544,12 @@ include perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/mech/gssapi.asn1 gs include perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData| include perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/digest.asn1 digest_asn1| -include perl_path_wrapper.sh et_deps.pl heimdal/lib/asn1/asn1_err.et| -include perl_path_wrapper.sh et_deps.pl heimdal/lib/hdb/hdb_err.et| -include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/heim_err.et| -include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et| -include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et| +include perl_path_wrapper.sh et_deps.pl heimdal/lib/asn1/asn1_err.et heimdal/lib/asn1| +include perl_path_wrapper.sh et_deps.pl heimdal/lib/hdb/hdb_err.et heimdal/lib/hdb| +include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/heim_err.et heimdal/lib/krb5| +include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et heimdal/lib/krb5| +include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et heimdal/lib/krb5| +include perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi| .SUFFIXES: .hin .hin.h: diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl index 2a8885e03d..c626d8b7ff 100755 --- a/source4/heimdal_build/et_deps.pl +++ b/source4/heimdal_build/et_deps.pl @@ -3,11 +3,11 @@ use File::Basename; my $file = shift; -my $dirname = dirname($file); +my $dirname = shift; my $basename = basename($file); -my $header = $file; $header =~ s/\.et$/.h/; -my $source = $file; $source =~ s/\.et$/.c/; +my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/; +my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/; print "$header $source: $file bin/compile_et\n"; print "\t\@echo \"Compiling error table $file\"\n"; -print "\t\@cd $dirname && ../../../bin/compile_et $basename\n\n"; +print "\t\@startdir=`pwd` && cd $dirname && " . '$$startdir/bin/compile_et $$startdir/' . "$file\n\n"; diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index ff58927ace..465563bda5 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -9,6 +9,7 @@ /* HDB module dir - set to Samba LIBDIR/hdb ? */ #define HDBDIR "/usr/heimdal/lib" +#define LIBDIR "/usr/heimdal/lib" /* Maximum values on all known systems */ #define MaxHostNameLen (64+4) |