[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  3d2c99f... s3-waf: Detect which version of krb5_enctype_to_string is used
       via  da0e0ef... s3-waf: Fix the build of swat with --enable-cups
      from  76f804a... s4:client/client.c - we don't need "&ctx" for talloc calls

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3d2c99f13b3b7f927ba3f912e8526f9e770aa34f
Author: Kai Blin <kai at samba.org>
Date:   Fri May 28 12:59:04 2010 +0200

    s3-waf: Detect which version of krb5_enctype_to_string is used
    
    Pair-Programmed-With: Günther Deschner <gd at samba.org>

commit da0e0efe876fdc5e1fe96d1e3a88541006770ff0
Author: Kai Blin <kai at samba.org>
Date:   Fri May 28 12:58:23 2010 +0200

    s3-waf: Fix the build of swat with --enable-cups

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript       |   24 ++++++++++++++++++++++++
 source3/wscript_build |    2 +-
 2 files changed, 25 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 0911e85..7e39a60 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -471,6 +471,30 @@ pkdata = krb5_princ_component(context, principal, 0);
                         headers='krb5.h', lib='krb5',
                         msg="Checking whether krb5_princ_component is available")
 
+        conf.CHECK_CODE('''
+int main(void) {
+char buf[256];
+krb5_enctype_to_string(1, buf, 256);
+return 0;
+}''',
+                        'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG',
+                        headers='krb5.h', lib='krb5',
+                        addmain=False, cflags='-Werror',
+                        msg="Checking whether krb5_enctype_to_string takes size_t argument")
+
+        conf.CHECK_CODE('''
+int main(void) {
+krb5_context context = NULL;
+char *str = NULL;
+krb5_enctype_to_string(context, 1, &str);
+if (str) free (str);
+return 0;
+}''',
+                        'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG',
+                        headers='krb5.h stdlib.h', lib='krb5',
+                        addmain=False, cflags='-Werror',
+                        msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
+
     else:
         conf.SET_TARGET_TYPE('krb5', 'EMPTY')
         conf.SET_TARGET_TYPE('gssapi', 'EMPTY')
diff --git a/source3/wscript_build b/source3/wscript_build
index c45f62b..66ee90a 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -943,7 +943,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
 bld.SAMBA_BINARY('web/swat',
                  source=SWAT_SRC,
                  deps='''talloc tevent cap DYNCONFIG LIBS LIBSMB LIBWBCLIENT PARAM
-                 LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT''',
+                 LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups''',
                  enabled=bld.env.build_swat,
                  install_path='${SBINDIR}',
                  vars=locals())


-- 
Samba Shared Repository