[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2798-g0286265
Jeremy Allison
jra at samba.org
Fri Aug 8 22:16:38 GMT 2008
The branch, v3-2-test has been updated
via 02862653724355b32e0c6e38e0ebcbb1a9954759 (commit)
from 5f419135ba1acae6bc37692fa77ae1162b62e0e3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 02862653724355b32e0c6e38e0ebcbb1a9954759
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 8 15:16:04 2008 -0700
Try and fix the build for systems that don't have krb5_auth_con_set_req_cksumtype().
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 1 +
source/libsmb/clikrb5.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index a213d0f..010c2e3 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -3368,6 +3368,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 8016d64..d195aee 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -41,7 +41,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,
@@ -705,7 +705,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. */
@@ -1773,7 +1773,7 @@ done:
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:
--
Samba Shared Repository
More information about the samba-cvs
mailing list