The branch, master has been updated
via a30ac85 ctdb-tests: Avoid segfault by initializing logging
via b2d75c0 ctdb-common: Fix CID 437606
from f033645 selftest: Use a longer self.account_lockout_duration and
self.lockout_observation_window
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a30ac853ff9bca023c53ad98775eabb23156c566
Author: Amitay Isaacs <[email protected]>
Date: Thu Jul 5 13:40:33 2018 +1000
ctdb-tests: Avoid segfault by initializing logging
This is in addition to af697008531.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Thu Jul 5 15:22:16 CEST 2018 on sn-devel-144
commit b2d75c0108f6edc7234bfa23a82b2c6c228a836f
Author: Amitay Isaacs <[email protected]>
Date: Wed Jul 4 17:45:45 2018 +1000
ctdb-common: Fix CID 437606
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/conf.c | 10 +++++-----
ctdb/tests/src/ctdb_takeover_tests.c | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/conf.c b/ctdb/common/conf.c
index 3c1369e..74af7f8 100644
--- a/ctdb/common/conf.c
+++ b/ctdb/common/conf.c
@@ -1014,11 +1014,6 @@ static int conf_load_internal(struct conf_context *conf)
int ret;
bool ok;
- fp = fopen(conf->filename, "r");
- if (fp == NULL) {
- return errno;
- }
-
state = (struct conf_load_state) {
.conf = conf,
.mode = (conf->reload ? CONF_MODE_RELOAD : CONF_MODE_LOAD),
@@ -1029,6 +1024,11 @@ static int conf_load_internal(struct conf_context *conf)
return ret;
}
+ fp = fopen(conf->filename, "r");
+ if (fp == NULL) {
+ return errno;
+ }
+
ok = tini_parse(fp,
false,
conf_load_section,
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c
b/ctdb/tests/src/ctdb_takeover_tests.c
index a0e2f0f..aec23c0 100644
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -254,6 +254,8 @@ int main(int argc, const char *argv[])
int loglevel;
const char *debuglevelstr = getenv("CTDB_TEST_LOGLEVEL");
+ setup_logging("ctdb_takeover_tests", DEBUG_STDERR);
+
if (! debug_level_parse(debuglevelstr, &loglevel)) {
loglevel = DEBUG_DEBUG;
}
--
Samba Shared Repository
