r6882: Put in configure tests and #ifdef to keep Samba building on older Heimdal.

Andrew Bartlett
(This used to be commit f2e926192595c74bd9cc8a3343e0fcf27a1de38b)

diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index d186e3ed1f5f7adf013f9b788ebb562ee39c6701..71d91a9c964afe0ddd876b219be2fdcb774c4a46 100644 (file)
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -256,6 +256,7 @@ static NTSTATUS gensec_gssapi_client_start(struct gensec_security *gensec_securi
                return nt_status;
        }
 
+#ifdef HAVE_GSS_KRB5_CCACHE_NAME /* FIXME, we need an alternate function */
        maj_stat = gss_krb5_ccache_name(&min_stat, 
                                        gensec_gssapi_state->ccache_name, 
                                        NULL);
@@ -265,6 +266,7 @@ static NTSTATUS gensec_gssapi_client_start(struct gensec_security *gensec_securi
                          gssapi_error_string(gensec_gssapi_state, maj_stat, min_stat)));
                return NT_STATUS_UNSUCCESSFUL;
        }
+#endif
 
        maj_stat = gss_acquire_cred(&min_stat, 
                                    gensec_gssapi_state->client_name,

diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4
index b78f96a877ed2f452a514bcf5e64e0690c6e9c76..67921e9717292c3cc18b681830e6c07db2d96f39 100644 (file)
--- a/source4/auth/kerberos/config.m4
+++ b/source4/auth/kerberos/config.m4
@@ -454,7 +454,8 @@ if test x"$with_krb5_support" != x"no"; then
 
        AC_CHECK_FUNC_EXT(gsskrb5_get_initiator_subkey, $KRB5_LIBS)
        AC_CHECK_FUNC_EXT(gsskrb5_extract_authz_data_from_sec_context, $KRB5_LIBS)
-
+       AC_CHECK_FUNC_EXT(gsskrb5_register_acceptor_identity, $KRB5_LIBS)
+       AC_CHECK_FUNC_EXT(gss_krb5_ccache_name, $KRB5_LIBS)
        if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then
                AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
                AC_MSG_CHECKING(whether KRB5 support is used)