Attachment 4978 Details for Bug 6918 – Fix for the krb5_auth_con_set_req_cksumtype message (from master)

[patch] Fix for the krb5_auth_con_set_req_cksumtype message (from master)

0001-s3-fixed-krb5-build-problem-on-ubuntu-karmic.patch (text/plain), 1.77 KB, created by Karolin Seeger on 2009-11-23 04:22:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2009-11-23 04:22:50 UTC

Size: 1.77 KB

patch

obsolete

>From a6e4cb500b4162cae1d906a1762507370b4ee89e Mon Sep 17 00:00:00 2001
>From: Andrew Tridgell <tridge@samba.org>
>Date: Fri, 16 Oct 2009 10:40:50 +1100
>Subject: [PATCH] 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
>---
> source3/configure.in     |    4 ++++
> source3/libsmb/clikrb5.c |    9 +++++++++
> 2 files changed, 13 insertions(+), 0 deletions(-)
>
>diff --git a/source3/configure.in b/source3/configure.in
>index 9d93ec7..ad43624 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 152c23b..145e30b 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);
> 
>-- 
>1.6.4.2
>

Flags:

gd: review+

Actions: View

Attachments on bug 6918: 4978