[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Fri Feb 19 18:13:04 UTC 2016


The branch, master has been updated
       via  da74d0c tevent: version 0.9.28
       via  312cb9d s4:dsdb_notification: fix the --picky-developer build with gcc 4.4.3
       via  3f428ca s4-libcli: Add missing ldb header
      from  415e3df loadparm: Remove an unneeded variable

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


- Log -----------------------------------------------------------------
commit da74d0c317be9ce67eb5d00d232167d466f68a1e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 19 11:46:03 2016 +0100

    tevent: version 0.9.28
    
    * Fix memory leak when old signal action restored (bug #11742)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri Feb 19 19:12:25 CET 2016 on sn-devel-144

commit 312cb9d84152e5d315ab8fedc36ab3861287c702
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 19 00:29:50 2016 +0100

    s4:dsdb_notification: fix the --picky-developer build with gcc 4.4.3
    
    The following warning/error is reported:
    
    [1891/4034] Compiling source4/dsdb/samdb/ldb_modules/dsdb_notification.c
    cc1: warnings being treated as errors
    ../source4/dsdb/samdb/ldb_modules/dsdb_notification.c: In function 'dsdb_notification_filter_search':
    ../source4/dsdb/samdb/ldb_modules/dsdb_notification.c:192: error: value computed is not used
    Waf: Leaving directory `/memdisk/autobuild/fl/b300949/samba/bin'
    Build failed:  -> task failed (err #1):
    	{task: cc dsdb_notification.c -> dsdb_notification_84.o}
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 3f428caed4b1b79aa8de7a979cf84a57b1a34274
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Feb 17 11:41:47 2016 +0100

    s4-libcli: Add missing ldb header
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 lib/tevent/ABI/{tevent-0.9.26.sigs => tevent-0.9.28.sigs} | 0
 lib/tevent/wscript                                        | 2 +-
 source4/dsdb/samdb/ldb_modules/dsdb_notification.c        | 2 +-
 source4/libcli/ldap/ldap_controls.c                       | 3 +++
 source4/libcli/ldap/wscript_build                         | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 copy lib/tevent/ABI/{tevent-0.9.26.sigs => tevent-0.9.28.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/ABI/tevent-0.9.26.sigs b/lib/tevent/ABI/tevent-0.9.28.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.26.sigs
copy to lib/tevent/ABI/tevent-0.9.28.sigs
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 501de16..2bdb5ac 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tevent'
-VERSION = '0.9.27'
+VERSION = '0.9.28'
 
 blddir = 'bin'
 
diff --git a/source4/dsdb/samdb/ldb_modules/dsdb_notification.c b/source4/dsdb/samdb/ldb_modules/dsdb_notification.c
index 02ccc44..19ae9db 100644
--- a/source4/dsdb/samdb/ldb_modules/dsdb_notification.c
+++ b/source4/dsdb/samdb/ldb_modules/dsdb_notification.c
@@ -189,7 +189,7 @@ static int dsdb_notification_filter_search(struct ldb_module *module,
 	down_tree->operation = LDB_OP_GREATER;
 	down_tree->u.equality.attr = "uSNChanged";
 	down_tree->u.equality.value = data_blob_string_const(filter_usn);
-	talloc_move(down_req, &filter_usn);
+	(void)talloc_move(down_req, &filter_usn);
 
 	ret = ldb_build_search_req_ex(&down_req, ldb, req,
 				      req->op.search.base,
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 14a80af..863e5b6 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -20,6 +20,9 @@
 */
 
 #include "includes.h"
+
+#include <ldb.h>
+
 #include "../lib/util/asn1.h"
 #include "libcli/ldap/libcli_ldap.h"
 #include "libcli/ldap/ldap_proto.h"
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index 1242673..4588233 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('cli-ldap',
                   autoproto='ldap_proto.h',
                   public_deps='samba-errors tevent',
                   private_headers='libcli_ldap.h:ldap-util.h',
-                  deps='cli_composite LIBSAMBA_TSOCKET samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common',
+                  deps='cli_composite ldb LIBSAMBA_TSOCKET samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common',
                   private_library=True
                   )
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list