[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  9317923 Add missing dependency on com_err.
       via  67fd0cd Add check for krb5_free_unparsed_name, when using external heimdal.
      from  123e5c1 s3: Fix Coverity ID 2478, UNINIT

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


- Log -----------------------------------------------------------------
commit 93179239ebda8e34c3fda671c1127a8214c216fa
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Apr 23 15:56:39 2011 +0200

    Add missing dependency on com_err.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sat Apr 23 16:53:03 CEST 2011 on sn-devel-104

commit 67fd0cd62e14d0edce4e73f8fdafa3722f9c50f6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Apr 23 15:46:18 2011 +0200

    Add check for krb5_free_unparsed_name, when using external heimdal.

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

Summary of changes:
 libcli/auth/wscript_build               |    2 +-
 source4/heimdal_build/wscript_configure |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index e7d8b56..bdf52d0 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -41,4 +41,4 @@ bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
 
 bld.SAMBA_SUBSYSTEM('KRB5_WRAP',
                     source='krb5_wrap.c kerberos_pac.c',
-                    deps='krb5 ndr-krb5pac')
+                    deps='krb5 ndr-krb5pac com_err')
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 3f46ed8..f711fe7 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -182,8 +182,9 @@ check_system_heimdal_lib("asn1", "initialize_asn1_error_table", "asn1_err.h", on
 check_system_heimdal_lib("heimbase", "heim_cmp", "heimbase.h", onlyif="roken")
 check_system_heimdal_lib("hcrypto", "MD4_Init", "hcrypto/md4.h",
     onlyif="asn1 roken com_err")
-check_system_heimdal_lib("krb5", "krb5_anyaddr", "krb5.h",
-    onlyif="roken wind asn1 hx509 hcrypto com_err heimbase")
+if check_system_heimdal_lib("krb5", "krb5_anyaddr", "krb5.h",
+    onlyif="roken wind asn1 hx509 hcrypto com_err heimbase"):
+    conf.CHECK_FUNCS_IN('krb5_free_unparsed_name', 'krb5', headers="krb5.h")
 check_system_heimdal_lib("gssapi", "gss_oid_to_name", "gssapi.h",
     onlyif="hcrypto asn1 roken krb5 com_err wind")
 check_system_heimdal_lib("heimntlm", "heim_ntlm_ntlmv2_key", "heimntlm.h",


-- 
Samba Shared Repository