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)

diff --git a/source/configure.in b/source/configure.in
index 7afa53c2dcf85acba59ffa96feeefda43f1875bb..c0a171285a3b63630a9b3421f003910892f8e1c1 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -3614,6 +3614,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 007fd8de7c40a2ca6360beef190bd66a0aa351ef..778b023b376e8f85035c2e5aa83d5f128989d047 100644 (file)
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -1823,6 +1823,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);