[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  4811cbe ctdb:server: fix DEBUG message for wrong event script options.
      from  8855906 WAF: use libsystemd-daemon only if linking actually succeeds

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4811cbea933c3665a08f9f0b37ad43afeace2b6c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 5 12:48:03 2014 +0200

    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

-----------------------------------------------------------------------

Summary of changes:
 ctdb/server/eventscript.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index bf95b21..a108b78 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/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;
 	}


-- 
Samba Shared Repository