[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  fbaed41... s3: fixed krb5 build problem on ubuntu karmic
      from  b6f1ece... s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit fbaed41c8f583f633673aca2f600c517744d28b5
Author: Andrew Tridgell <tridge at 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:
 source/configure.in     |    4 ++++
 source/libsmb/clikrb5.c |    9 +++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 462b112..cf46405 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 1e2fe01..d8fe40b 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);
 


-- 
Samba Shared Repository