[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-282-gae19f5a

[Stefan Metzmacher]

The branch, master has been updated
       via  ae19f5acddee6d6507225c0c9a625383255a6d4c (commit)
       via  6028e8f34626e7443ee58becaf1d27b9e2c56088 (commit)
      from  0245b9b97363f08786c25d4412ed293ca6f94cd5 (commit)

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


- Log -----------------------------------------------------------------
commit ae19f5acddee6d6507225c0c9a625383255a6d4c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 31 08:55:49 2009 +0100

    s4:build: require ldb 0.9.3 when building against an external library
    
    metze

commit 6028e8f34626e7443ee58becaf1d27b9e2c56088
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 31 08:53:26 2009 +0100

    heimdal: void functions should not return a value
    
    metze

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

Summary of changes:
 source3/samba4.m4                       |    2 +-
 source4/configure.ac                    |    2 +-
 source4/heimdal/lib/krb5/error_string.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index fd0cc83..ee47fcc 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -71,7 +71,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent >= 0.9.2,
 
 SMB_INCLUDE_MK(../lib/tevent/python.mk) 
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.3,
 	[
 		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
 		SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/configure.ac b/source4/configure.ac
index ef3bfd7..3277879 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -66,7 +66,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent >= 0.9.2,
 
 SMB_INCLUDE_MK(../lib/tevent/python.mk) 
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.3,
 	[
 		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
 		SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/heimdal/lib/krb5/error_string.c b/source4/heimdal/lib/krb5/error_string.c
index db2df47..6374fa1 100644
--- a/source4/heimdal/lib/krb5/error_string.c
+++ b/source4/heimdal/lib/krb5/error_string.c
@@ -271,7 +271,7 @@ void KRB5_LIB_FUNCTION
 krb5_clear_error_string(krb5_context context)
      __attribute__((deprecated))
 {
-    return krb5_clear_error_message(context);
+    krb5_clear_error_message(context);
 }
 
 #endif /* !HEIMDAL_SMALLER */


-- 
Samba Shared Repository