[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  530c2c8 ldb: version 1.1.28
       via  e369d80 pyldb: protect PyErr_LDB_ERROR_IS_ERR_RAISE() with do {} while(0)
      from  28fbc5e s3-net: use SMB_SIGNING_DEFAULT in connect_to_service()

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


- Log -----------------------------------------------------------------
commit 530c2c8f976281be941c314090be7bc60e6b22ed
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Nov 12 14:14:34 2016 +0000

    ldb: version 1.1.28
    
    * Fix the build with installed ldb-devel 1.1.27
      We depend on LDB_UNPACK_DATA_FLAG_NO_VALUES_ALLOC.
    
    * Some build fixes.
    
    * More performance improvements.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Nov 23 20:48:31 CET 2016 on sn-devel-144

commit e369d800ba64a4047787afd0b416f7d26cfd33f4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 8 09:18:52 2016 +0100

    pyldb: protect PyErr_LDB_ERROR_IS_ERR_RAISE() with do {} while(0)
    
    This should avoid the following warning:
    
     CID 1394274:  Control flow issues  (DEADCODE)
     Execution cannot reach this statement: ";".
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 lib/ldb/ABI/{ldb-1.1.27.sigs => ldb-1.1.28.sigs}                   | 0
 lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.1.28.sigs}     | 0
 lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util.py3-1.1.28.sigs} | 0
 lib/ldb/pyldb.h                                                    | 5 +++--
 lib/ldb/wscript                                                    | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
 copy lib/ldb/ABI/{ldb-1.1.27.sigs => ldb-1.1.28.sigs} (100%)
 copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.1.28.sigs} (100%)
 copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util.py3-1.1.28.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/ABI/ldb-1.1.27.sigs b/lib/ldb/ABI/ldb-1.1.28.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-1.1.27.sigs
copy to lib/ldb/ABI/ldb-1.1.28.sigs
diff --git a/lib/ldb/ABI/pyldb-util-1.1.10.sigs b/lib/ldb/ABI/pyldb-util-1.1.28.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-1.1.10.sigs
copy to lib/ldb/ABI/pyldb-util-1.1.28.sigs
diff --git a/lib/ldb/ABI/pyldb-util-1.1.10.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-1.1.10.sigs
copy to lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
diff --git a/lib/ldb/pyldb.h b/lib/ldb/pyldb.h
index e0cce1e..4fc89ec 100644
--- a/lib/ldb/pyldb.h
+++ b/lib/ldb/pyldb.h
@@ -95,11 +95,12 @@ typedef struct {
 	struct ldb_control *data;
 } PyLdbControlObject;
 
-#define PyErr_LDB_ERROR_IS_ERR_RAISE(err,ret,ldb) \
+#define PyErr_LDB_ERROR_IS_ERR_RAISE(err,ret,ldb) do { \
 	if (ret != LDB_SUCCESS) { \
 		PyErr_SetLdbError(err, ret, ldb); \
 		return NULL; \
-	}
+	} \
+} while(0)
 
 /* Picked out of thin air. To do this properly, we should probably have some part of the 
  * errors in LDB be allocated to bindings ? */
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 13f1d93..1bab04d 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'ldb'
-VERSION = '1.1.27'
+VERSION = '1.1.28'
 
 blddir = 'bin'
 


-- 
Samba Shared Repository