summaryrefslogtreecommitdiff
path: root/source4/heimdal_build
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-09-01 01:32:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:36:18 -0500
commit147878160354059a939263d68b30c8baf659b39d (patch)
tree1b86490b806260ec1979aa97a11a724cb69120aa /source4/heimdal_build
parent1b5cb7309d13b472eff12e1bfb5191ca8e0391ae (diff)
downloadsamba-147878160354059a939263d68b30c8baf659b39d.tar.gz
samba-147878160354059a939263d68b30c8baf659b39d.tar.bz2
samba-147878160354059a939263d68b30c8baf659b39d.zip
r9859: Enable (blocking) KDC resolution with DNS.
To enable, set: [libdefaults] dns_lookup_realm = true dns_lookup_kdc = true in your /etc/krb5.conf. In the future I may override the krb5.conf and set this on by default in Samba4. Andrew Bartlett (This used to be commit 32fb50d02560123b8d0ab13346041806c062f9bf)
Diffstat (limited to 'source4/heimdal_build')
-rw-r--r--source4/heimdal_build/config.m424
-rw-r--r--source4/heimdal_build/config.mk2
2 files changed, 25 insertions, 1 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 27cc0a3c9a..f511c322ec 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -175,6 +175,30 @@ rk_CHECK_VAR(h_errno,
#include <netdb.h>
#endif])
+sinclude(heimdal/cf/find-func.m4)
+sinclude(heimdal/cf/find-func-no-libs.m4)
+sinclude(heimdal/cf/find-func-no-libs2.m4)
+sinclude(heimdal/cf/resolv.m4)
+
+smb_save_LIBS=$LIBS
+RESOLV_LIBS=""
+LIBS=""
+
+dnl This fills in the global LIBS...
+rk_RESOLV
+
+dnl AC_CHECK_LIB_EXT(resolv, RESOLV_LIBS, res_search)
+ SMB_EXT_LIB_ENABLE(RESOLV,YES)
+
+if test x"$LIBS" != "x"; then
+ RESOLV_LIBS=$LIBS
+fi
+
+LIBS=$smb_save_LIBS
+
+SMB_EXT_LIB(RESOLV,[${RESOLV_LIBS}],[${RESOLV_CFLAGS}],[${RESOLV_CPPFLAGS}],[${RESOLV_LDFLAGS}])
+
+
# these are disabled unless heimdal is found below
SMB_SUBSYSTEM_ENABLE(KERBEROS_LIB, NO)
SMB_BINARY_ENABLE(asn1_compile, NO)
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index ae57b78c24..1e34857522 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -460,7 +460,7 @@ heimdal_clean: hdb_asn1_clean spnego_asn1_clean krb5_asn1_clean
NOPROTO = YES
REQUIRED_SUBSYSTEMS = \
HEIMDAL_GSSAPI HEIMDAL_KRB5 \
- HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_VERS HEIMDAL_GLUE
+ HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_VERS HEIMDAL_GLUE EXT_LIB_RESOLV
# End SUBSYSTEM HEIMDAL
#######################