summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-08-08 15:15:36 -0700
committerJeremy Allison <jra@samba.org>2008-08-08 15:15:36 -0700
commit6d99eedafc3f35a4cdd544c6eea9a7f527193b50 (patch)
treee3ba191dbbf064c4bd6b0b2b46497453a85c01e1 /source3
parentc6930a0b40a95294931888e8749be8cf90f50ac9 (diff)
downloadsamba-6d99eedafc3f35a4cdd544c6eea9a7f527193b50.tar.gz
samba-6d99eedafc3f35a4cdd544c6eea9a7f527193b50.tar.bz2
samba-6d99eedafc3f35a4cdd544c6eea9a7f527193b50.zip
Try and fix the build for systems that don't have krb5_auth_con_set_req_cksumtype().
Jeremy. (This used to be commit 8598e7b06ec57ca6fcde863270e6bb0e2de9993e)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in1
-rw-r--r--source3/libsmb/clikrb5.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in
index ae308cee56..32dbaa4bfa 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3383,6 +3383,7 @@ if test x"$with_ads_support" != x"no"; then
AC_CHECK_FUNC_EXT(krb5_get_init_creds_opt_get_error, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_enctype_to_string, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_fwd_tgt_creds, $KRB5_LIBS)
+ AC_CHECK_FUNC_EXT(krb5_auth_con_set_req_cksumtype, $KRB5_LIBS)
LIBS="$KRB5_LIBS $LIBS"
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 9d39483eae..9cd5cd3310 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -43,7 +43,7 @@
#define GSSAPI_BNDLENGTH 16 /* Bind Length (rfc-1964 pg.3) */
#define GSSAPI_CHECKSUM_SIZE (12+GSSAPI_BNDLENGTH)
-#if defined(TKT_FLG_OK_AS_DELEGATE) && defined(HAVE_KRB5_FWD_TGT_CREDS)
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
static krb5_error_code ads_krb5_get_fwd_ticket( krb5_context context,
krb5_auth_context *auth_context,
krb5_creds *credsp,
@@ -723,7 +723,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
*expire_time = (time_t)credsp->times.endtime;
}
-#if defined(TKT_FLG_OK_AS_DELEGATE) && defined(HAVE_KRB5_FWD_TGT_CREDS)
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
if( credsp->ticket_flags & TKT_FLG_OK_AS_DELEGATE ) {
/* Fetch a forwarded TGT from the KDC so that we can hand off a 2nd ticket
as part of the kerberos exchange. */
@@ -1813,7 +1813,7 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
return ret;
}
-#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS)
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
/**************************************************************
Routine: ads_krb5_get_fwd_ticket
Description: