The branch, v4-4-test has been updated
via 8db189b ctdb-recovery: Avoid NULL dereference in failure case
via d6c2372 ctdb-locking: Reset real-time priority in lock helper
from 27653e8 s4-torture: add spoolss_SetPrinter ndr test to validate
secdesc_ptr
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -----------------------------------------------------------------
commit 8db189bc6c287a7b0b2d5db2f674c1015110bf00
Author: Amitay Isaacs <[email protected]>
Date: Fri Nov 18 11:47:56 2016 +1100
ctdb-recovery: Avoid NULL dereference in failure case
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12434
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon Nov 21 12:26:04 CET 2016 on sn-devel-144
(cherry picked from commit 54e392b385728bba047404465207340a2e354ec6)
Autobuild-User(v4-4-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-4-test): Tue Nov 22 13:32:29 CET 2016 on sn-devel-144
commit d6c2372589b74f0da84a42995e3284a3bd935987
Author: Amitay Isaacs <[email protected]>
Date: Thu Nov 17 16:10:51 2016 +1100
ctdb-locking: Reset real-time priority in lock helper
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12392
Earlier we were relying on SCHED_RESET_ON_FORK to reset the priority of lock
helper processes. Since SCHED_RESET_ON_FORK support has been removed, the
scheduling priority of child processes created using vfork() need to be
reset
explicitly in the helper processes.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Fri Nov 18 10:18:27 CET 2016 on sn-devel-144
(cherry picked from commit 6c6d63c04497fdfdbe665508f2a503f2392dc526)
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdb_lock_helper.c | 2 ++
ctdb/server/ctdb_recovery_helper.c | 1 +
2 files changed, 3 insertions(+)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index 543c5d0..a5da7cc 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -129,6 +129,8 @@ int main(int argc, char *argv[])
int ppid;
const char *lock_type;
+ reset_scheduler();
+
progname = argv[0];
if (argc < 5) {
diff --git a/ctdb/server/ctdb_recovery_helper.c
b/ctdb/server/ctdb_recovery_helper.c
index 5d1fee9..861aa6b 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -138,6 +138,7 @@ static struct recdb_context *recdb_create(TALLOC_CTX
*mem_ctx, uint32_t db_id,
if (recdb->db == NULL) {
talloc_free(recdb);
LOG("failed to create recovery db %s\n", recdb->db_path);
+ return NULL;
}
recdb->persistent = persistent;
--
Samba Shared Repository
