diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-16 10:40:50 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-01-13 14:00:55 +0100 |
| commit | 3e5e42dd3fcefb481fc2d3fd71f9ca5fd0b1aa03 (patch) | |
| tree | f3953d5895f97b997927e8afe73196701903ecb3 /source | |
| parent | 00e8942b330972bcf2e611571b3ad0cbdd6c8191 (diff) | |
| download | samba-3e5e42dd3fcefb481fc2d3fd71f9ca5fd0b1aa03.tar.gz samba-3e5e42dd3fcefb481fc2d3fd71f9ca5fd0b1aa03.tar.xz samba-3e5e42dd3fcefb481fc2d3fd71f9ca5fd0b1aa03.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
(cherry picked from commit a6e4cb500b4162cae1d906a1762507370b4ee89e)
Part of a fix for bug #6918.
(cherry picked from commit fbaed41c8f583f633673aca2f600c517744d28b5)
Diffstat (limited to 'source')
| -rw-r--r-- | source/configure.in | 4 | ||||
| -rw-r--r-- | source/libsmb/clikrb5.c | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source/configure.in b/source/configure.in index 462b112d7d4..cf46405c3b6 100644 --- a/source/configure.in +++ b/source/configure.in @@ -3627,6 +3627,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/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c index 1e2fe01f91a..d8fe40bb420 100644 --- a/source/libsmb/clikrb5.c +++ b/source/libsmb/clikrb5.c @@ -1842,6 +1842,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); |