[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1e32ada tdb: version 1.3.3
       via  6244346 tdb/test: TDB_CLEAR_IF_FIRST | TDB_MUTEX_LOCKING, O_RDONLY is a valid combination
      from  87d39a8 Minor spelling correction in samba-tool domain

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


- Log -----------------------------------------------------------------
commit 1e32ada8ec1a2699caa1e813782cfc8a1c50f690
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 2 08:42:18 2014 +0100

    tdb: version 1.3.3
    
    This fixes the tdb1-run-mutex-openflags2 test when robust mutexes are available.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10781
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Dec  2 11:54:28 CET 2014 on sn-devel-104

commit 6244346c11c40b3ed39ee626e1d27c75a29b7430
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 2 08:39:05 2014 +0100

    tdb/test: TDB_CLEAR_IF_FIRST | TDB_MUTEX_LOCKING, O_RDONLY is a valid combination
    
    This used to be invalid in the early developement code, but now we're
    able to open a tdb with mutex area and TDB_NOLOCK without problems.
    O_RDONLY implies TDB_NOLOCK...
    
    This should have been part of commit c8d05e934ea03fffbc34944d2d51a016b89a7eca.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10781
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 lib/tdb/ABI/{tdb-1.3.0.sigs => tdb-1.3.3.sigs} | 0
 lib/tdb/test/run-mutex-openflags2.c            | 5 +++--
 lib/tdb/wscript                                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 copy lib/tdb/ABI/{tdb-1.3.0.sigs => tdb-1.3.3.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/ABI/tdb-1.3.0.sigs b/lib/tdb/ABI/tdb-1.3.3.sigs
similarity index 100%
copy from lib/tdb/ABI/tdb-1.3.0.sigs
copy to lib/tdb/ABI/tdb-1.3.3.sigs
diff --git a/lib/tdb/test/run-mutex-openflags2.c b/lib/tdb/test/run-mutex-openflags2.c
index 57ac7e3..6522ae4 100644
--- a/lib/tdb/test/run-mutex-openflags2.c
+++ b/lib/tdb/test/run-mutex-openflags2.c
@@ -75,8 +75,9 @@ static int do_child(int fd)
 			  TDB_CLEAR_IF_FIRST |
 			  TDB_MUTEX_LOCKING,
 			  O_RDONLY, 0755, &nolog_ctx, NULL);
-	ok((tdb == NULL) && (errno == EINVAL), "TDB_MUTEX_LOCKING with "
-	   "O_RDONLY should fail with EINVAL - %d", errno);
+	ok((tdb != NULL), "TDB_MUTEX_LOCKING with "
+	   "O_RDONLY should work - %d", errno);
+	tdb_close(tdb);
 
 	tdb = tdb_open_ex("mutex-openflags2.tdb", 0,
 			  TDB_CLEAR_IF_FIRST |
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 99433e8..d129b24 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tdb'
-VERSION = '1.3.2'
+VERSION = '1.3.3'
 
 blddir = 'bin'
 


-- 
Samba Shared Repository