[SCM] CTDB repository - branch 1.0.114 updated - ctdb-1.0.114.7-2-g21bf0bd

[Michael Adam]

The branch, 1.0.114 has been updated
       via  21bf0bd397b9075963f268110c9108f6be854164 (commit)
       via  258ad45872615e58d16a3109fd31ca5081471e3e (commit)
      from  052001d83de13c20705c9701bb47c06959096ee7 (commit)

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


- Log -----------------------------------------------------------------
commit 21bf0bd397b9075963f268110c9108f6be854164
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
    
    (Imported from commit 4811cbea933c3665a08f9f0b37ad43afeace2b6c)

commit 258ad45872615e58d16a3109fd31ca5081471e3e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Apr 24 13:56:19 2014 +0200

    Less verbosity when there is no public addresses file
    
    This is partly cherry-picked from master commits:
    
    8837daa424732aeb5a20814b1709c345a97a0e09
    e646142f4d28b5401235cd5edee325f7a29f8193
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 config/events.d/10.interface |    4 +++-
 server/eventscript.c         |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index d7abc18..dd2a088 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -13,7 +13,9 @@ loadconfig
 }
 
 [ ! -f "$CTDB_PUBLIC_ADDRESSES" ] && {
-	echo "No public addresses file found. Nothing to do for 10.interfaces"
+	if [ "$1" = "init" ]; then
+		echo "No public addresses file found. Nothing to do for 10.interfaces"
+	fi
 	exit 0
 }
 
diff --git a/server/eventscript.c b/server/eventscript.c
index 182aed6..a207bde 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -646,8 +646,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;
 	}


-- 
CTDB repository