[PATCH] to fix a debug message in ctdb

[Michael Adam]

On 2014-06-06 at 01:19 +1000, Amitay Isaacs wrote:
> On Fri, Jun 6, 2014 at 12:28 AM, Michael Adam <obnox at samba.org> wrote:
> 
> > Attached is the patch for master.
> > Should also be applied to ctdb 2.5 and older
> > versions.
> >
> > Review/push/comments appreciated!
> >
> > Cheers - Michael
> >
> 
> Pushed.

Thanks Amitay,

attached find the patch ported to CTDB branches.
It applies to 2.5 and I will bring it to 1.0.114.

Cheers - Michael
-------------- next part --------------
From 4811cbea933c3665a08f9f0b37ad43afeace2b6c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 5 Jun 2014 12:48:03 +0200
Subject: [PATCH] ctdb:server: fix DEBUG message for wrong event script
 options.

Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
Autobuild-Date(master): Thu Jun  5 19:51:36 CEST 2014 on sn-devel-104

(Imported from commit 4811cbea933c3665a08f9f0b37ad43afeace2b6c)

---
 server/eventscript.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/eventscript.c b/server/eventscript.c
index bf95b21..a108b78 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -754,8 +754,9 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
 		return -1;
 	}
 	if (!check_options(state->call, state->options)) {
-		DEBUG(DEBUG_ERR, ("Bad eventscript options '%s' for %s\n",
-				  ctdb_eventscript_call_names[state->call], state->options));
+		DEBUG(DEBUG_ERR, ("Bad eventscript options '%s' for '%s'\n",
+				  state->options,
+				  ctdb_eventscript_call_names[state->call]));
 		talloc_free(state);
 		return -1;
 	}
-- 
1.9.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140606/041d9023/attachment.pgp>