svn commit: samba r6882 - in branches/SAMBA_4_0/source/auth: gensec kerberos

[abartlet at samba.org]

Author: abartlet
Date: 2005-05-18 14:17:53 +0000 (Wed, 18 May 2005)
New Revision: 6882

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6882

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

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
   branches/SAMBA_4_0/source/auth/kerberos/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c	2005-05-18 11:58:26 UTC (rev 6881)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c	2005-05-18 14:17:53 UTC (rev 6882)
@@ -256,6 +256,7 @@
 		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 @@
 			  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,

Modified: branches/SAMBA_4_0/source/auth/kerberos/config.m4
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-05-18 11:58:26 UTC (rev 6881)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-05-18 14:17:53 UTC (rev 6882)
@@ -454,7 +454,8 @@
 
 	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)