summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-05-18 14:17:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:54 -0500
commitab92b82d83db4e6a812d048f02fa4ffffeec8691 (patch)
tree0824c1046bd4f9ab295e39ac4de5d04e79d138e0
parent2a01014f8feed4c4b89bc9c92d48ce2a6ae16405 (diff)
downloadsamba-ab92b82d83db4e6a812d048f02fa4ffffeec8691.tar.gz
samba-ab92b82d83db4e6a812d048f02fa4ffffeec8691.tar.bz2
samba-ab92b82d83db4e6a812d048f02fa4ffffeec8691.zip
r6882: Put in configure tests and #ifdef to keep Samba building on older Heimdal.
Andrew Bartlett (This used to be commit f2e926192595c74bd9cc8a3343e0fcf27a1de38b)
-rw-r--r--source4/auth/gensec/gensec_gssapi.c2
-rw-r--r--source4/auth/kerberos/config.m43
2 files changed, 4 insertions, 1 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index d186e3ed1f..71d91a9c96 100644
--- 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 b78f96a877..67921e9717 100644
--- 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)