From 8c018ff786952424a2f1c612046eb91d2e42f648 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Jul 2005 03:52:31 +0000 Subject: r8310: replace the heimdal networking interface scanning code with glue code that uses the Samba interfaces list. This makes heimdal obey the 'interfaces=' smb.conf option, and should also fix the portability problems with the heimdal code (This used to be commit ba621d1c554e135f449a144019b84719a086e04f) --- source4/heimdal_build/config.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'source4/heimdal_build/config.mk') diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index aca4589ffe..c0fe33bf9e 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -114,7 +114,6 @@ ADD_OBJ_FILES = \ heimdal/lib/krb5/free_host_realm.o \ heimdal/lib/krb5/generate_seq_number.o \ heimdal/lib/krb5/generate_subkey.o \ - heimdal/lib/krb5/get_addrs.o \ heimdal/lib/krb5/get_cred.o \ heimdal/lib/krb5/get_default_principal.o \ heimdal/lib/krb5/get_default_realm.o \ @@ -285,12 +284,18 @@ ADD_OBJ_FILES = \ heimdal/lib/roken/strlwr.o \ heimdal/lib/roken/strsep_copy.o \ heimdal/lib/roken/strupr.o \ - heimdal/lib/roken/strpool.o \ - heimdal/lib/roken/getifaddrs.o + heimdal/lib/roken/strpool.o NOPROTO = YES # End SUBSYSTEM HEIMDAL_ROKEN ####################### +####################### +# Start SUBSYSTEM HEIMDAL_GLUE +[SUBSYSTEM::HEIMDAL_GLUE] +ADD_OBJ_FILES = heimdal_build/glue.o +# End SUBSYSTEM HEIMDAL_GLUE +####################### + ####################### # Start SUBSYSTEM HEIMDAL_COM_ERR [SUBSYSTEM::HEIMDAL_COM_ERR] @@ -377,7 +382,7 @@ NOPROTO = YES TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include REQUIRED_SUBSYSTEMS = \ HEIMDAL_GSSAPI HEIMDAL_KRB5 \ - HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR + HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_GLUE # End SUBSYSTEM HEIMDAL ####################### -- cgit