kerberos: Only include gssapi/gssapi_krb5.h when available

diff --git a/lib/replace/system/kerberos.h b/lib/replace/system/kerberos.h
index 10d5f76ccc5c4a49a2c34259afb67845bfee3a6f..6d8c59f9b57b78ce56d5afc0e83ac2bb934db9f9 100644 (file)
--- a/lib/replace/system/kerberos.h
+++ b/lib/replace/system/kerberos.h
@@ -45,7 +45,9 @@
 #include <gssapi.h>
 #endif
 
+#if HAVE_GSSAPI_GSSAPI_KRB5_H
 #include <gssapi/gssapi_krb5.h>
+#endif
 
 #endif
 #endif

diff --git a/source3/configure.in b/source3/configure.in
index 3624c25e62e6ea020a997dcd50b0738a1bd34ee1..8164a44f004510d32ac982bc05feb936a75ca564 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3791,7 +3791,7 @@ if test x"$with_ads_support" != x"no"; then
 
   # now check for gssapi headers.  This is also done here to allow for
   # different kerberos include paths
-  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h com_err.h)
+  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h)
 
   ##################################################################
   # we might need the k5crypto and com_err libraries on some systems

diff --git a/source3/wscript b/source3/wscript
index 175bbf12ef956e53dcce93241f1d2f49028317d3..78ff40c99a50e9538fa8fd7fc53e7baab6e5030e 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -619,7 +619,7 @@ msg.msg_acctrightslen = sizeof(fd);
             conf.check_cfg(path="krb5-config", args="--cflags --libs",
                        package="gssapi", uselib_store="krb5")
         conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
-        conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h com_err.h', lib='krb5')
+        conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h', lib='krb5')
 
         if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
             conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index cd2a70f32017f20a1551d0434488ea42e5ba5552..6552d3a9253143df361b8d400fd5ca6bfc3f082b 100644 (file)
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -73,6 +73,7 @@ conf.DEFINE('SAMBA4_INTERNAL_HEIMDAL', 1)
 # setup the right defines for a in-tree heimdal build
 Logs.info("Using in-tree heimdal kerberos defines")
 conf.define('HAVE_GSSAPI_GSSAPI_H', 1)
+conf.define('HAVE_GSSAPI_GSSAPI_KRB5_H', 1)
 conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1)
 conf.define('HAVE_KRB5_ADDRESSES', 1)
 conf.define('HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK', 1)