From: Jeremy Allison Date: Fri, 8 Aug 2008 22:15:36 +0000 (-0700) Subject: Try and fix the build for systems that don't have krb5_auth_con_set_req_cksumtype(). X-Git-Tag: samba-3.3.0pre1~261 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8598e7b06ec57ca6fcde863270e6bb0e2de9993e;p=thirdparty%2Fsamba.git Try and fix the build for systems that don't have krb5_auth_con_set_req_cksumtype(). Jeremy. --- diff --git a/source/configure.in b/source/configure.in index ae308cee564..32dbaa4bfaa 100644 --- a/source/configure.in +++ b/source/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/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c index 9d39483eae1..9cd5cd33109 100644 --- a/source/libsmb/clikrb5.c +++ b/source/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: