diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-30 12:05:25 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-30 04:58:04 +0200 |
| commit | e1eae822856c076f63874d8d3b07691b3154848d (patch) | |
| tree | a4784ae6685cd7bd810bd626c0f600c7ca8f0f6a | |
| parent | b1f2547699d335287d5f007d108a067eb7a0203d (diff) | |
| download | samba-e1eae822856c076f63874d8d3b07691b3154848d.tar.gz samba-e1eae822856c076f63874d8d3b07691b3154848d.tar.bz2 samba-e1eae822856c076f63874d8d3b07691b3154848d.zip | |
kerberos: Only include gssapi/gssapi_krb5.h when available
| -rw-r--r-- | lib/replace/system/kerberos.h | 2 | ||||
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/wscript | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/lib/replace/system/kerberos.h b/lib/replace/system/kerberos.h index 10d5f76ccc..6d8c59f9b5 100644 --- 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 3624c25e62..8164a44f00 100644 --- 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 175bbf12ef..78ff40c99a 100644 --- 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 cd2a70f320..6552d3a925 100644 --- 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) |