diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-16 10:40:50 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-16 10:40:50 +1100 |
| commit | a6e4cb500b4162cae1d906a1762507370b4ee89e (patch) | |
| tree | 1734c8172b15e9fc2f05c22ccae422c1aec80c4c /source3 | |
| parent | 70b020ca7698c30f3c0647f620d690aba7674022 (diff) | |
| download | samba-a6e4cb500b4162cae1d906a1762507370b4ee89e.tar.gz samba-a6e4cb500b4162cae1d906a1762507370b4ee89e.tar.bz2 samba-a6e4cb500b4162cae1d906a1762507370b4ee89e.zip | |
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
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in index 9d93ec7d99..ad43624f2e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3434,6 +3434,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 152c23bd15..145e30beb3 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -1858,6 +1858,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); |