Attachment 14393 Details for Bug 13554 – Patches for 4.9.x

[patch] Patches for 4.9.x

BZ13554-v4-9.patch (text/plain), 1.89 KB, created by Amitay Isaacs on 2018-08-06 06:45:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2018-08-06 06:45:13 UTC

Size: 1.89 KB

patch

obsolete

>From ee150758bbcda3fa24dd9df43b7954d194b32502 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 31 Jul 2018 21:53:39 +0200
>Subject: [PATCH 1/2] ctdb: Fix a cut&paste error
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13554
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>(cherry picked from commit 33d012c3cebb5625e02450ac3b08c4245a3e985d)
>---
> ctdb/common/path.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ctdb/common/path.c b/ctdb/common/path.c
>index 36706e43b32..165664650ed 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");
>-- 
>2.17.1
>
>
>From f469e681297739e71de293f30449ff83674da657 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 31 Jul 2018 17:44:25 +1000
>Subject: [PATCH 2/2] ctdb-eventd: Fix CID 1438155
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13554
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
>Autobuild-Date(master): Fri Aug  3 11:14:01 CEST 2018 on sn-devel-144
>
>(cherry picked from commit f7b2e5eec5ba1fa5f26694e6555a98cab0594a27)
>---
> ctdb/event/event_tool.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ctdb/event/event_tool.c b/ctdb/event/event_tool.c
>index 4768c678b13..f18deb8d5b1 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);
>-- 
>2.17.1
>

Flags:

martins: review+

Actions: View

Attachments on bug 13554: 14393