The branch, v3-4-test has been updated via 8c2dfcd... s3: fixed krb5 build problem on ubuntu karmic from 5d6ea13... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log ----------------------------------------------------------------- commit 8c2dfcd24f69aa8d71a2854feaf2e8ea1802537e Author: Andrew Tridgell <tri...@samba.org> Date: Fri Oct 16 10:40:50 2009 +1100 s3: fixed krb5 build problem on ubuntu karmic Karmic has MIT krb5 1.7-beta3, which has the symbol krb5_auth_con_set_req_cksumtype but no prototype for it. See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531635 (cherry picked from commit a6e4cb500b4162cae1d906a1762507370b4ee89e) Part of a fix for bug #6918. ----------------------------------------------------------------------- Summary of changes: source3/configure.in | 4 ++++ source3/libsmb/clikrb5.c | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 6644bdd..70a8fe8 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3384,6 +3384,10 @@ if test x"$with_ads_support" != x"no"; then AC_CHECK_FUNC_EXT(krb5_fwd_tgt_creds, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_auth_con_set_req_cksumtype, $KRB5_LIBS) + # MIT krb5 1.7beta3 (in Ubuntu Karmic) does not have this declaration + # but does have the symbol + AC_CHECK_DECLS(krb5_auth_con_set_req_cksumtype, [], [], [#include <krb5.h>]) + LIBS="$KRB5_LIBS $LIBS" AC_CACHE_CHECK(whether krb5_ticket contains kvno and enctype, diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index aa98d76..76d99c1 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -1853,6 +1853,15 @@ static krb5_error_code ads_krb5_get_fwd_ticket( krb5_context context, char *pChksum = NULL; char *p = NULL; +/* MIT krb5 1.7beta3 (in Ubuntu Karmic) is missing the prototype, + but still has the symbol */ +#if !HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE +krb5_error_code krb5_auth_con_set_req_cksumtype( + krb5_context context, + krb5_auth_context auth_context, + krb5_cksumtype cksumtype); +#endif + ZERO_STRUCT(fwdData); ZERO_STRUCTP(authenticator); -- Samba Shared Repository