The branch, master has been updated
via f7b2e5e ctdb-eventd: Fix CID 1438155
via 33d012c ctdb: Fix a cut&paste error
from e053aad s3/utils: fix regression where specifying -Unetbios/root
works
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f7b2e5eec5ba1fa5f26694e6555a98cab0594a27
Author: Amitay Isaacs <[email protected]>
Date: Tue Jul 31 17:44:25 2018 +1000
ctdb-eventd: Fix CID 1438155
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13554
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Fri Aug 3 11:14:01 CEST 2018 on sn-devel-144
commit 33d012c3cebb5625e02450ac3b08c4245a3e985d
Author: Volker Lendecke <[email protected]>
Date: Tue Jul 31 21:53:39 2018 +0200
ctdb: Fix a cut&paste error
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13554
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/path.c | 2 +-
ctdb/event/event_tool.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/path.c b/ctdb/common/path.c
index 36706e4..1656646 100644
--- a/ctdb/common/path.c
+++ b/ctdb/common/path.c
@@ -149,7 +149,7 @@ const char *path_vardir(void)
{
bool ok;
- if (! ctdb_paths.rundir_set) {
+ if (! ctdb_paths.vardir_set) {
ok = path_construct(ctdb_paths.vardir, "var");
if (!ok) {
D_ERR("Failed to construct VARDIR\n");
diff --git a/ctdb/event/event_tool.c b/ctdb/event/event_tool.c
index 4768c67..f18deb8 100644
--- a/ctdb/event/event_tool.c
+++ b/ctdb/event/event_tool.c
@@ -320,7 +320,7 @@ static int event_command_script_list(TALLOC_CTX *mem_ctx,
subdir = talloc_asprintf(mem_ctx, "events/%s", argv[0]);
if (subdir == NULL) {
- ret = ENOMEM;
+ return ENOMEM;
}
data_dir = path_datadir_append(mem_ctx, subdir);
--
Samba Shared Repository
