The Samba-Bugzilla – Attachment 10474 Details for
Bug 10974
We need to backport tdb-1.3.x to v4-2-test...
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Additional patches for master
tmp.diff.txt (text/plain), 5.99 KB, created by
Stefan Metzmacher
on 2014-12-02 07:50:23 UTC
(
hide
)
Description:
Additional patches for master
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2014-12-02 07:50:23 UTC
Size:
5.99 KB
patch
obsolete
>From dace6aa31ed5792ed57f4c305d53536647099b60 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 2 Dec 2014 08:39:05 +0100 >Subject: [PATCH 1/2] 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@samba.org> >--- > lib/tdb/test/run-mutex-openflags2.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > >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 | >-- >1.9.1 > > >From 0d2140ee284f04a4d61e5007dc6b24df7964a744 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 2 Dec 2014 08:42:18 +0100 >Subject: [PATCH 2/2] 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@samba.org> >--- > lib/tdb/ABI/tdb-1.3.3.sigs | 68 ++++++++++++++++++++++++++++++++++++++++++++++ > lib/tdb/wscript | 2 +- > 2 files changed, 69 insertions(+), 1 deletion(-) > create mode 100644 lib/tdb/ABI/tdb-1.3.3.sigs > >diff --git a/lib/tdb/ABI/tdb-1.3.3.sigs b/lib/tdb/ABI/tdb-1.3.3.sigs >new file mode 100644 >index 0000000..7d3e469 >--- /dev/null >+++ b/lib/tdb/ABI/tdb-1.3.3.sigs >@@ -0,0 +1,68 @@ >+tdb_add_flags: void (struct tdb_context *, unsigned int) >+tdb_append: int (struct tdb_context *, TDB_DATA, TDB_DATA) >+tdb_chainlock: int (struct tdb_context *, TDB_DATA) >+tdb_chainlock_mark: int (struct tdb_context *, TDB_DATA) >+tdb_chainlock_nonblock: int (struct tdb_context *, TDB_DATA) >+tdb_chainlock_read: int (struct tdb_context *, TDB_DATA) >+tdb_chainlock_unmark: int (struct tdb_context *, TDB_DATA) >+tdb_chainunlock: int (struct tdb_context *, TDB_DATA) >+tdb_chainunlock_read: int (struct tdb_context *, TDB_DATA) >+tdb_check: int (struct tdb_context *, int (*)(TDB_DATA, TDB_DATA, void *), void *) >+tdb_close: int (struct tdb_context *) >+tdb_delete: int (struct tdb_context *, TDB_DATA) >+tdb_dump_all: void (struct tdb_context *) >+tdb_enable_seqnum: void (struct tdb_context *) >+tdb_error: enum TDB_ERROR (struct tdb_context *) >+tdb_errorstr: const char *(struct tdb_context *) >+tdb_exists: int (struct tdb_context *, TDB_DATA) >+tdb_fd: int (struct tdb_context *) >+tdb_fetch: TDB_DATA (struct tdb_context *, TDB_DATA) >+tdb_firstkey: TDB_DATA (struct tdb_context *) >+tdb_freelist_size: int (struct tdb_context *) >+tdb_get_flags: int (struct tdb_context *) >+tdb_get_logging_private: void *(struct tdb_context *) >+tdb_get_seqnum: int (struct tdb_context *) >+tdb_hash_size: int (struct tdb_context *) >+tdb_increment_seqnum_nonblock: void (struct tdb_context *) >+tdb_jenkins_hash: unsigned int (TDB_DATA *) >+tdb_lock_nonblock: int (struct tdb_context *, int, int) >+tdb_lockall: int (struct tdb_context *) >+tdb_lockall_mark: int (struct tdb_context *) >+tdb_lockall_nonblock: int (struct tdb_context *) >+tdb_lockall_read: int (struct tdb_context *) >+tdb_lockall_read_nonblock: int (struct tdb_context *) >+tdb_lockall_unmark: int (struct tdb_context *) >+tdb_log_fn: tdb_log_func (struct tdb_context *) >+tdb_map_size: size_t (struct tdb_context *) >+tdb_name: const char *(struct tdb_context *) >+tdb_nextkey: TDB_DATA (struct tdb_context *, TDB_DATA) >+tdb_null: dptr = 0xXXXX, dsize = 0 >+tdb_open: struct tdb_context *(const char *, int, int, int, mode_t) >+tdb_open_ex: struct tdb_context *(const char *, int, int, int, mode_t, const struct tdb_logging_context *, tdb_hash_func) >+tdb_parse_record: int (struct tdb_context *, TDB_DATA, int (*)(TDB_DATA, TDB_DATA, void *), void *) >+tdb_printfreelist: int (struct tdb_context *) >+tdb_remove_flags: void (struct tdb_context *, unsigned int) >+tdb_reopen: int (struct tdb_context *) >+tdb_reopen_all: int (int) >+tdb_repack: int (struct tdb_context *) >+tdb_rescue: int (struct tdb_context *, void (*)(TDB_DATA, TDB_DATA, void *), void *) >+tdb_runtime_check_for_robust_mutexes: bool (void) >+tdb_set_logging_function: void (struct tdb_context *, const struct tdb_logging_context *) >+tdb_set_max_dead: void (struct tdb_context *, int) >+tdb_setalarm_sigptr: void (struct tdb_context *, volatile sig_atomic_t *) >+tdb_store: int (struct tdb_context *, TDB_DATA, TDB_DATA, int) >+tdb_summary: char *(struct tdb_context *) >+tdb_transaction_cancel: int (struct tdb_context *) >+tdb_transaction_commit: int (struct tdb_context *) >+tdb_transaction_prepare_commit: int (struct tdb_context *) >+tdb_transaction_start: int (struct tdb_context *) >+tdb_transaction_start_nonblock: int (struct tdb_context *) >+tdb_transaction_write_lock_mark: int (struct tdb_context *) >+tdb_transaction_write_lock_unmark: int (struct tdb_context *) >+tdb_traverse: int (struct tdb_context *, tdb_traverse_func, void *) >+tdb_traverse_read: int (struct tdb_context *, tdb_traverse_func, void *) >+tdb_unlock: int (struct tdb_context *, int, int) >+tdb_unlockall: int (struct tdb_context *) >+tdb_unlockall_read: int (struct tdb_context *) >+tdb_validate_freelist: int (struct tdb_context *, int *) >+tdb_wipe_all: int (struct tdb_context *) >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' > >-- >1.9.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 10974
:
10472
| 10474 |
10476