diff --git a/fencing/commands.c b/fencing/commands.c
index 53ded9114f..9acc6986f3 100644
--- a/fencing/commands.c
+++ b/fencing/commands.c
@@ -1,1582 +1,1587 @@
 /* 
  * Copyright (C) 2009 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <crm_internal.h>
 
 #include <sys/param.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 
 #include <crm/crm.h>
 #include <crm/msg_xml.h>
 #include <crm/common/ipc.h>
 #include <crm/cluster/internal.h>
 #include <crm/common/mainloop.h>
 
 #include <crm/stonith-ng.h>
 #include <crm/fencing/internal.h>
 #include <crm/common/xml.h>
 
 #include <internal.h>
 
 GHashTable *device_list = NULL;
 GHashTable *topology = NULL;
 GList *cmd_list = NULL;
 
 static int active_children = 0;
 static gboolean stonith_device_dispatch(gpointer user_data);
 static void st_child_done(GPid pid, int rc, const char *output, gpointer user_data);
 
 typedef struct async_command_s {
 
     int id;
     int pid;
     int fd_stdout;
     int options;
     int default_timeout;
     int timeout;
 
     char *op;
     char *origin;
     char *client;
     char *client_name;
     char *remote_op_id;
 
     char *victim;
     char *action;
     char *device;
     char *mode;
 
     GListPtr device_list;
     GListPtr device_next;
 
     void (*done)(GPid pid, int rc, const char *output, gpointer user_data);
     guint timer_sigterm;
     guint timer_sigkill;
     /*! If the operation timed out, this is the last signal
      *  we sent to the process to get it to terminate */
     int last_timeout_signo;
 } async_command_t;
 
 static xmlNode *
 stonith_construct_async_reply(async_command_t *cmd, const char *output, xmlNode *data, int rc);
 
 static int
 get_action_timeout(stonith_device_t *device, const char *action, int default_timeout)
 {
     char buffer[512] = { 0, };
     char *value = NULL;
 
     CRM_CHECK(action != NULL, return default_timeout);
 
     if (!device->params) {
         return default_timeout;
     }
 
     snprintf(buffer, sizeof(buffer) - 1, "pcmk_%s_timeout", action);
     value = g_hash_table_lookup(device->params, buffer);
 
     if (!value) {
         return default_timeout;
     }
 
     return  atoi(value);
 }
 
 static void free_async_command(async_command_t *cmd)
 {
     if (!cmd) {
         return;
     }
     cmd_list = g_list_remove(cmd_list, cmd);
 
     g_list_free(cmd->device_list);
     free(cmd->device);
     free(cmd->action);
     free(cmd->victim);
     free(cmd->remote_op_id);
     free(cmd->client);
     free(cmd->client_name);
     free(cmd->origin);
     free(cmd->op);
     free(cmd);
 }
 
 static async_command_t *create_async_command(xmlNode *msg)
 {
     async_command_t *cmd = NULL;
     xmlNode *op = get_xpath_object("//@"F_STONITH_ACTION, msg, LOG_ERR);
     const char *action = crm_element_value(op, F_STONITH_ACTION);
 
     CRM_CHECK(action != NULL, crm_log_xml_warn(msg, "NoAction"); return NULL);
 
     crm_log_xml_trace(msg, "Command");
     cmd = calloc(1, sizeof(async_command_t));
     crm_element_value_int(msg, F_STONITH_CALLID,   &(cmd->id));
     crm_element_value_int(msg, F_STONITH_CALLOPTS, &(cmd->options));
     crm_element_value_int(msg, F_STONITH_TIMEOUT,  &(cmd->default_timeout));
     cmd->timeout = cmd->default_timeout;
 
     cmd->origin = crm_element_value_copy(msg, F_ORIG);
     cmd->remote_op_id = crm_element_value_copy(msg, F_STONITH_REMOTE_OP_ID);
     cmd->client = crm_element_value_copy(msg, F_STONITH_CLIENTID);
     cmd->client_name = crm_element_value_copy(msg, F_STONITH_CLIENTNAME);
     cmd->op     = crm_element_value_copy(msg, F_STONITH_OPERATION);
     cmd->action = strdup(action);
     cmd->victim = crm_element_value_copy(op, F_STONITH_TARGET);
     cmd->mode   = crm_element_value_copy(op, F_STONITH_MODE);
     cmd->device = crm_element_value_copy(op, F_STONITH_DEVICE);
 
     CRM_CHECK(cmd->op != NULL, crm_log_xml_warn(msg, "NoOp"); free_async_command(cmd); return NULL);
     CRM_CHECK(cmd->client != NULL, crm_log_xml_warn(msg, "NoClient"));
 
     cmd_list = g_list_append(cmd_list, cmd);
     return cmd;
 }
 
 static int stonith_manual_ack(xmlNode *msg, remote_fencing_op_t *op)
 {
     async_command_t *cmd = create_async_command(msg);
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);
 
     if(cmd == NULL) {
         return -EINVAL;
     }
 
     cmd->device = strdup("manual_ack");
     cmd->remote_op_id = strdup(op->id);
 
     crm_notice("Injecting manual confirmation that %s is safely off/down",
                crm_element_value(dev, F_STONITH_TARGET));
 
     st_child_done(0, 0, NULL, cmd);
     return pcmk_ok;
 }
 
 static gboolean stonith_device_execute(stonith_device_t *device)
 {
     int rc = 0;
     int exec_rc = 0;
     async_command_t *cmd = NULL;
     stonith_action_t *action = NULL;
     CRM_CHECK(device != NULL, return FALSE);
 
     if(device->active_pid) {
         crm_trace("%s is still active with pid %u", device->id, device->active_pid);
         return TRUE;
     }
 
     if(device->pending_ops) {
         GList *first = device->pending_ops;
         device->pending_ops = g_list_remove_link(device->pending_ops, first);
         cmd = first->data;
         g_list_free_1(first);
     }
 
     if(cmd == NULL) {
         crm_trace("Nothing further to do for %s", device->id);
         return TRUE;
     }
 
     action = stonith_action_create(device->agent,
         cmd->action,
         cmd->victim,
         cmd->timeout,
         device->params,
         device->aliases);
 
     exec_rc = stonith_action_execute_async(action, (void *) cmd, st_child_done);
 
     if(exec_rc > 0) {
         crm_debug("Operation %s%s%s on %s now running with pid=%d, timeout=%dms",
             cmd->action, cmd->victim?" for node ":"", cmd->victim?cmd->victim:"",
             device->id, exec_rc, cmd->timeout);
         device->active_pid = exec_rc;
 
     } else {
         crm_warn("Operation %s%s%s on %s failed (%d/%d)",
             cmd->action, cmd->victim?" for node ":"", cmd->victim?cmd->victim:"",
             device->id, exec_rc, rc);
         st_child_done(0, rc<0?rc:exec_rc, NULL, cmd);
     }
     return TRUE;
 }
 
 static gboolean stonith_device_dispatch(gpointer user_data)
 {
     return stonith_device_execute(user_data);
 }
 
 static void schedule_stonith_command(async_command_t *cmd, stonith_device_t *device)
 {
     CRM_CHECK(cmd != NULL, return);
     CRM_CHECK(device != NULL, return);
 
     if (cmd->device) {
         free(cmd->device);
     }
 
     cmd->device = strdup(device->id);
     cmd->timeout = get_action_timeout(device, cmd->action, cmd->default_timeout);
 
     if (cmd->remote_op_id) {
         crm_debug("Scheduling %s on %s for remote peer %s with op id (%s) (timeout=%dms)",
            cmd->action,
            device->id,
            cmd->origin,
            cmd->remote_op_id,
            cmd->timeout);
     } else {
         crm_debug("Scheduling %s on %s for %s (timeout=%dms)",
             cmd->action,
             device->id,
             cmd->client,
             cmd->timeout);
     }
 
     device->pending_ops = g_list_append(device->pending_ops, cmd);
     mainloop_set_trigger(device->work);
 }
 
 void free_device(gpointer data)
 {
     GListPtr gIter = NULL;
     stonith_device_t *device = data;
 
     g_hash_table_destroy(device->params);
     g_hash_table_destroy(device->aliases);
 
     for(gIter = device->pending_ops; gIter != NULL; gIter = gIter->next) {
         async_command_t *cmd = gIter->data;
 
         crm_warn("Removal of device '%s' purged operation %s", device->id, cmd->action);
         st_child_done(0, -ENODEV, NULL, cmd);
         free_async_command(cmd);
     }
     g_list_free(device->pending_ops);
 
     g_list_free_full(device->targets, free);
     free(device->namespace);
     free(device->agent);
     free(device->id);
     free(device);
 }
 
 static GHashTable *build_port_aliases(const char *hostmap, GListPtr *targets) 
 {
     char *name = NULL;
     int last = 0, lpc = 0, max = 0, added = 0;
     GHashTable *aliases = g_hash_table_new_full(crm_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str);
 
     if(hostmap == NULL) {
         return aliases;
     }
 
     max = strlen(hostmap);
     for(; lpc <= max; lpc++) {
         switch(hostmap[lpc]) {
         /* Assignment chars */
         case '=':
         case ':':
             if(lpc > last) {
                 free(name);
                 name = calloc(1, 1 + lpc - last);
                 memcpy(name, hostmap + last, lpc - last);
             }
             last = lpc + 1;
             break;
 
         /* Delimeter chars */
         /* case ',': Potentially used to specify multiple ports */
         case 0:
         case ';':
         case ' ':
         case '\t':
             if(name) {
                 char *value = NULL;
                 value = calloc(1, 1 + lpc - last);
                 memcpy(value, hostmap + last, lpc - last);
 
                 crm_debug("Adding alias '%s'='%s'", name, value);
                 g_hash_table_replace(aliases, name, value);
                 if(targets) {
                     *targets = g_list_append(*targets, strdup(value));
                 }
                 value=NULL;
                 name=NULL;
                 added++;
 
             } else if(lpc > last) {
                 crm_debug("Parse error at offset %d near '%s'", lpc-last, hostmap+last);
             }
 
             last = lpc + 1;
             break;
         }
 
         if(hostmap[lpc] == 0) {
             break;
         }
     }
 
     if(added == 0) {
         crm_info("No host mappings detected in '%s'", hostmap);
     }
 
     free(name);
     return aliases;
 }
 
 static void parse_host_line(const char *line, GListPtr *output) 
 {
     int lpc = 0;
     int max = 0;
     int last = 0;
 
     if(line) {
         max = strlen(line);
     } else {
         return;
     }
 
     /* Check for any complaints about additional parameters that the device doesn't understand */
     if(strstr(line, "invalid") || strstr(line, "variable")) {
         crm_debug("Skipping: %s", line);
         return;
     }
 
     crm_trace("Processing: %s", line);
     /* Skip initial whitespace */
     for(lpc = 0; lpc <= max && isspace(line[lpc]); lpc++) {
         last = lpc+1;
     }
 
     /* Now the actual content */
     for(lpc = 0; lpc <= max; lpc++) {
         gboolean a_space = isspace(line[lpc]);
         if(a_space && lpc < max && isspace(line[lpc+1])) {
             /* fast-forward to the end of the spaces */
 
         } else if(a_space || line[lpc] == ',' || line[lpc] == 0) {
             int rc = 1;
             char *entry = NULL;
 
             if(lpc != last) {
                 entry = calloc(1, 1 + lpc - last);
                 rc = sscanf(line+last, "%[a-zA-Z0-9_-.]", entry);
             }
 
             if(entry == NULL) {
                 /* Skip */
             } else if(rc != 1) {
                 crm_warn("Could not parse (%d %d): %s", last, lpc, line+last);
             } else if(safe_str_neq(entry, "on") && safe_str_neq(entry, "off")) {
                 crm_trace("Adding '%s'", entry);
                 *output = g_list_append(*output, entry);
                 entry = NULL;
             }
 
             free(entry);
             last = lpc + 1;
         }
     }
 }
 
 static GListPtr parse_host_list(const char *hosts) 
 {
     int lpc = 0;
     int max = 0;
     int last = 0;
     GListPtr output = NULL;
 
     if(hosts == NULL) {
         return output;
     }
 
     max = strlen(hosts);
     for(lpc = 0; lpc <= max; lpc++) {
         if(hosts[lpc] == '\n' || hosts[lpc] == 0) {
             char *line = NULL;
 
             line = calloc(1, 2 + lpc - last);
             snprintf(line, 1 + lpc - last, "%s", hosts+last);
             parse_host_line(line, &output);
             free(line);
 
             last = lpc + 1;
         }
     }
 
     return output;
 }
 
 static stonith_device_t *build_device_from_xml(xmlNode *msg) 
 {
     xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, msg, LOG_ERR);
     stonith_device_t *device = NULL;
 
     device = calloc(1, sizeof(stonith_device_t));
     device->id = crm_element_value_copy(dev, XML_ATTR_ID);
     device->agent = crm_element_value_copy(dev, "agent");
     device->namespace = crm_element_value_copy(dev, "namespace");
     device->params = xml2list(dev);
     device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
     /* TODO: Hook up priority */
 
     return device;
 }
 
 static const char *
 target_list_type(stonith_device_t *dev)
 {
     const char *check_type = NULL;
 
     check_type = g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTCHECK);
 
     if(check_type == NULL) {
 
         if(g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTLIST)) {
             check_type = "static-list";
         } else if(g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTMAP)) {
             check_type = "static-list";
         } else {
             check_type = "dynamic-list";
         }
     }
 
 	return check_type;
 }
 
 static void
 update_dynamic_list(stonith_device_t *dev)
 {
     time_t now = time(NULL);
 
     /* Host/alias must be in the list output to be eligable to be fenced
      *
      * Will cause problems if down'd nodes aren't listed or (for virtual nodes)
      *  if the guest is still listed despite being moved to another machine
      */
 
     if(dev->targets_age < 0) {
         crm_trace("Port list queries disabled for %s", dev->id);
 
     } else if(dev->targets == NULL || dev->targets_age + 60 < now) {
         stonith_action_t *action = NULL;
         char *output = NULL;
         int rc = pcmk_ok;
         int exec_rc = pcmk_ok;
 
         if(dev->active_pid != 0) {
             crm_notice("Port list query can not execute because device is busy, using cache: %s",
                     dev->targets ? "YES" : "NO");
             return;
         }
 
         action = stonith_action_create(dev->agent, "list", NULL, 5, dev->params, NULL);
         exec_rc = stonith_action_execute(action, &rc, &output);
 
         if(rc != 0 && dev->active_pid == 0) {
             /* This device probably only supports a single
              * connection, which appears to already be in use,
              * likely involved in a montior or (less likely)
              * metadata operation.
              *
              * Avoid disabling port list queries in the hope that
              * the op would succeed next time
              */
             crm_info("Couldn't query ports for %s. Call failed with rc=%d and active_pid=%d: %s",
                      dev->agent, rc, dev->active_pid, output);
 
         } else if(exec_rc < 0 || rc != 0) {
             crm_notice("Disabling port list queries for %s (%d/%d): %s",
                            dev->id, exec_rc, rc, output);
             dev->targets_age = -1;
 
             /* Fall back to status */
             g_hash_table_replace(dev->params, strdup(STONITH_ATTR_HOSTCHECK), strdup("status"));
 
             g_list_free_full(dev->targets, free);
             dev->targets = NULL;
         } else {
             crm_info("Refreshing port list for %s", dev->id);
             g_list_free_full(dev->targets, free);
             dev->targets = parse_host_list(output);
             dev->targets_age = now;
         }
 
         free(output);
     }
 }
 
 /*!
  * \internal
  * \brief Checks to see if an identical device already exists in the device_list
  */
 static stonith_device_t *
 device_has_duplicate(stonith_device_t *device)
 {
     char *key = NULL;
     char *value = NULL;
     GHashTableIter gIter;
     stonith_device_t *dup = g_hash_table_lookup(device_list, device->id);
 
     if (!dup || safe_str_neq(dup->agent, device->agent)) {
         return NULL;
     }
     g_hash_table_iter_init(&gIter, device->params);
     while (g_hash_table_iter_next(&gIter, (void **) &key, (void **) &value)) {
         char *other_value = g_hash_table_lookup(dup->params, key);
         if (!other_value || safe_str_neq(other_value, value)) {
             return NULL;
         }
     }
 
     return dup;
 }
 
 int stonith_device_register(xmlNode *msg, const char **desc) 
 {
     const char *value = NULL;
     stonith_device_t *dup = NULL;
     stonith_device_t *device = build_device_from_xml(msg);
 
     value = g_hash_table_lookup(device->params, STONITH_ATTR_HOSTLIST);
     if(value) {
         device->targets = parse_host_list(value);
     }
 
     value = g_hash_table_lookup(device->params, STONITH_ATTR_HOSTMAP);
     device->aliases = build_port_aliases(value, &(device->targets));
 
     value = target_list_type(device);
     if (safe_str_eq(value, "dynamic-list")) {
         /* set the dynamic list during the register to guarantee we have
          * targets cached */
         update_dynamic_list(device);
     }
 
     if ((dup = device_has_duplicate(device))) {
         crm_notice("Device '%s' already existed in device list (%d active devices)", device->id, g_hash_table_size(device_list));
         free_device(device);
         device = dup;
     } else {
         g_hash_table_replace(device_list, device->id, device);
 
         crm_notice("Added '%s' to the device list (%d active devices)", device->id, g_hash_table_size(device_list));
     }
     if(desc) {
         *desc = device->id;
     }
     return pcmk_ok;
 }
 
 int stonith_device_remove(const char *id)
 {
     if(g_hash_table_remove(device_list, id)) {
         crm_info("Removed '%s' from the device list (%d active devices)",
                  id, g_hash_table_size(device_list));
     } else {
         crm_info("Device '%s' not found (%d active devices)",
                  id, g_hash_table_size(device_list));
     }
     return pcmk_ok;
 }
 
 static int count_active_levels(stonith_topology_t *tp)
 {
     int lpc = 0;
     int count = 0;
     for(lpc = 0; lpc < ST_LEVEL_MAX; lpc++) {
         if(tp->levels[lpc] != NULL) {
             count++;
         }
     }
     return count;
 }
 
 void free_topology_entry(gpointer data)
 {
     stonith_topology_t *tp = data;
 
     int lpc = 0;
     for(lpc = 0; lpc < ST_LEVEL_MAX; lpc++) {
         if(tp->levels[lpc] != NULL) {
             g_list_free_full(tp->levels[lpc], free);
         }
     }
     free(tp->node);
     free(tp);
 }
 
 int stonith_level_register(xmlNode *msg, char **desc) 
 {
     int id = 0;
     int rc = pcmk_ok;
     xmlNode *child = NULL;
 
     xmlNode *level = get_xpath_object("//"F_STONITH_LEVEL, msg, LOG_ERR);
     const char *node = crm_element_value(level, F_STONITH_TARGET);
     stonith_topology_t *tp = g_hash_table_lookup(topology, node);
 
     crm_element_value_int(level, XML_ATTR_ID, &id);
     if(desc) {
         *desc = g_strdup_printf("%s[%d]", node, id);
     }
     if(id <= 0 || id >= ST_LEVEL_MAX) {
         return -EINVAL;
     }
 
     if(tp == NULL) {
         tp = calloc(1, sizeof(stonith_topology_t));
         tp->node = strdup(node);
         g_hash_table_replace(topology, tp->node, tp);
         crm_trace("Added %s to the topology (%d active entries)", node, g_hash_table_size(topology));
     }
 
     if(tp->levels[id] != NULL) {
         crm_info("Adding to the existing %s[%d] topology entry (%d active entries)", node, id, count_active_levels(tp));
     }
 
     for (child = __xml_first_child(level); child != NULL; child = __xml_next(child)) {
         const char *device = ID(child);
         crm_trace("Adding device '%s' for %s (%d)", device, node, id);
         tp->levels[id] = g_list_append(tp->levels[id], strdup(device));
     }
 
     crm_info("Node %s has %d active fencing levels", node, count_active_levels(tp));
     return rc;
 }
 
 int stonith_level_remove(xmlNode *msg, char **desc) 
 {
     int id = 0;
     xmlNode *level = get_xpath_object("//"F_STONITH_LEVEL, msg, LOG_ERR);
     const char *node = crm_element_value(level, F_STONITH_TARGET);
     stonith_topology_t *tp = g_hash_table_lookup(topology, node);
 
     if(desc) {
         *desc = g_strdup_printf("%s[%d]", node, id);
     }
     crm_element_value_int(level, XML_ATTR_ID, &id);
 
     if(tp == NULL) {
         crm_info("Node %s not found (%d active entries)",
                  node, g_hash_table_size(topology));
         return pcmk_ok;
 
     } else if(id < 0 || id >= ST_LEVEL_MAX) {
         return -EINVAL;
     }
 
     if(id == 0 && g_hash_table_remove(topology, node)) {
         crm_info("Removed all %s related entries from the topology (%d active entries)",
                  node, g_hash_table_size(topology));
 
     } else if(id > 0 && tp->levels[id] != NULL) {
         g_list_free_full(tp->levels[id], free);
         tp->levels[id] = NULL;
 
         crm_info("Removed entry '%d' from %s's topology (%d active entries remaining)",
                  id, node, count_active_levels(tp));
     }
     return pcmk_ok;
 }
 
 static gboolean string_in_list(GListPtr list, const char *item)
 {
     int lpc = 0;
     int max = g_list_length(list);
     for(lpc = 0; lpc < max; lpc ++) {
         const char *value = g_list_nth_data(list, lpc);
         if(safe_str_eq(item, value)) {
             return TRUE;
         }
     }
     return FALSE;
 }
 
 static int stonith_device_action(xmlNode *msg, char **output) 
 {
     int rc = pcmk_ok;
     xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, msg, LOG_ERR);
     const char *id = crm_element_value(dev, F_STONITH_DEVICE);
 
     async_command_t *cmd = NULL;
     stonith_device_t *device = NULL;
 
     if(id) {
         crm_trace("Looking for '%s'", id);
         device = g_hash_table_lookup(device_list, id);
     }
 
     if(device) {
         cmd = create_async_command(msg);
         if(cmd == NULL) {
             free_device(device);
             return -EPROTO;
         }
 
         schedule_stonith_command(cmd, device);
         rc = -EINPROGRESS;
 
     } else {
         crm_info("Device %s not found", id?id:"<none>");
         rc = -ENODEV;
     }
     return rc;
 }
 
 static gboolean can_fence_host_with_device(stonith_device_t *dev, const char *host)
 {
     gboolean can = FALSE;
     const char *alias = host;
     const char *check_type = NULL;
 
     if(dev == NULL) {
         return FALSE;
 
     } else if(host == NULL) {
         return TRUE;
     }
 
     if(g_hash_table_lookup(dev->aliases, host)) {
         alias = g_hash_table_lookup(dev->aliases, host);
     }
 
     check_type = target_list_type(dev);
 
     if(safe_str_eq(check_type, "none")) {
         can = TRUE;
 
     } else if(safe_str_eq(check_type, "static-list")) {
 
         /* Presence in the hostmap is sufficient
          * Only use if all hosts on which the device can be active can always fence all listed hosts
          */
 
         if(string_in_list(dev->targets, host)) {
             can = TRUE;
         } else if(g_hash_table_lookup(dev->params, STONITH_ATTR_HOSTMAP)
                   && g_hash_table_lookup(dev->aliases, host)) {
             can = TRUE;
         }
 
     } else if(safe_str_eq(check_type, "dynamic-list")) {
         update_dynamic_list(dev);
 
         if(string_in_list(dev->targets, alias)) {
             can = TRUE;
         }
 
     } else if(safe_str_eq(check_type, "status")) {
         int rc = 0;
         int exec_rc = 0;
         stonith_action_t *action = NULL;
         /* Run the status operation for the device/target combination
          * Will cause problems if the device doesn't return 2 for down'd nodes or
          *  (for virtual nodes) if the device doesn't return 1 for guests that
          *  have been moved to another host
          */
 
         action = stonith_action_create(dev->agent, "status", host, 5, dev->params, dev->aliases);
         exec_rc = stonith_action_execute(action, &rc, NULL);
 
         if(exec_rc != 0) {
             crm_err("Could not invoke %s: rc=%d", dev->id, exec_rc);
 
         } else if(rc == 1 /* unkown */) {
             crm_trace("Host %s is not known by %s", host, dev->id);
 
         } else if(rc == 0 /* active */ || rc == 2 /* inactive */) {
             can = TRUE;
 
         } else {
             crm_notice("Unkown result when testing if %s can fence %s: rc=%d", dev->id, host, rc);
         }
 
     } else {
         crm_err("Unknown check type: %s", check_type);
     }
 
     if(safe_str_eq(host, alias)) {
         crm_info("%s can%s fence %s: %s", dev->id, can?"":" not", host, check_type);
     } else {
         crm_info("%s can%s fence %s (aka. '%s'): %s", dev->id, can?"":" not", host, alias, check_type);
     }
     return can;
 }
 
 
 struct device_search_s 
 {
     const char *host;
     GListPtr capable;
 };
 
 static void search_devices(
     gpointer key, gpointer value, gpointer user_data) 
 {
     stonith_device_t *dev = value;
     struct device_search_s *search = user_data;
     if(can_fence_host_with_device(dev, search->host)) {
         search->capable = g_list_append(search->capable, value);
     }
 }
 
 static int stonith_query(xmlNode *msg, xmlNode **list) 
 {
     struct device_search_s search;
     int available_devices = 0;
     const char *action = NULL;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_ACTION, msg, LOG_DEBUG_3);
 
     search.host = NULL;
     search.capable = NULL;
 
     if(dev) {
         const char *device = crm_element_value(dev, F_STONITH_DEVICE);
         search.host = crm_element_value(dev, F_STONITH_TARGET);
         if(device && safe_str_eq(device, "manual_ack")) {
             /* No query necessary */
             if(list) {
                 *list = NULL;
             }
             return pcmk_ok;
         }
 
         action = crm_element_value(dev, F_STONITH_ACTION);
     }
 
     crm_log_xml_debug(msg, "Query");
 
     g_hash_table_foreach(device_list, search_devices, &search);
     available_devices = g_list_length(search.capable);
     if(search.host) {
         crm_debug("Found %d matching devices for '%s'",
                  available_devices, search.host);
     } else {
         crm_debug("%d devices installed", available_devices);
     }
 
     /* Pack the results into data */
     if(list) {
         GListPtr lpc = NULL;
         *list = create_xml_node(NULL, __FUNCTION__);
         crm_xml_add(*list, F_STONITH_TARGET, search.host);
         crm_xml_add_int(*list, "st-available-devices", available_devices);
         for(lpc = search.capable; lpc != NULL; lpc = lpc->next) {
             stonith_device_t *device = (stonith_device_t*)lpc->data;
             int action_specific_timeout = get_action_timeout(device, action, 0);
 
             dev = create_xml_node(*list, F_STONITH_DEVICE);
             crm_xml_add(dev, XML_ATTR_ID, device->id);
             crm_xml_add(dev, "namespace", device->namespace);
             crm_xml_add(dev, "agent", device->agent);
             crm_xml_add_int(dev, F_STONITH_DEVICE_VERIFIED, device->verified);
             if (action_specific_timeout) {
                 crm_xml_add_int(dev, F_STONITH_ACTION_TIMEOUT, action_specific_timeout);
             }
             if(search.host == NULL) {
                 xmlNode *attrs = create_xml_node(dev, XML_TAG_ATTRS);
                 g_hash_table_foreach(device->params, hash2field, attrs);
             }
         }
     }
 
     g_list_free(search.capable);
 
     return available_devices;
 }
 
+#define ST_LOG_OUTPUT_MAX 512
 static void log_operation(async_command_t *cmd, int rc, int pid, const char *next, const char *output) 
 {
     if(rc == 0) {
         next = NULL;
     }
 
     if(cmd->victim != NULL) {
         do_crm_log(rc==0?LOG_NOTICE:LOG_ERR,
                    "Operation '%s' [%d] (call %d from %s) for host '%s' with device '%s' returned: %d (%s)%s%s",
                    cmd->action, pid, cmd->id, cmd->client_name, cmd->victim, cmd->device, rc, pcmk_strerror(rc),
                    next?". Trying: ":"", next?next:"");
     } else {
         do_crm_log_unlikely(rc==0?LOG_DEBUG:LOG_NOTICE,
                    "Operation '%s' [%d] for device '%s' returned: %d (%s)%s%s",
                    cmd->action, pid, cmd->device, rc, pcmk_strerror(rc), next?". Trying: ":"", next?next:"");
     }
 
     if(output) {
         /* Logging the whole string confuses syslog when the string is xml */ 
         char *local_copy = strdup(output);
         int lpc = 0, last = 0, more = strlen(local_copy);
+
+        /* Give the log output some reasonable boundary */
+        more = more > ST_LOG_OUTPUT_MAX ? ST_LOG_OUTPUT_MAX : more;
+
         for(lpc = 0; lpc < more; lpc++) {
             if(local_copy[lpc] == '\n' || local_copy[lpc] == 0) {
                 local_copy[lpc] = 0;
                 do_crm_log(rc==0?LOG_INFO:LOG_WARNING, "%s: %s",
                            cmd->device, local_copy+last);
                 last = lpc+1;
             }
         }
         crm_debug("%s: %s (total %d bytes)", cmd->device, local_copy+last, more);
         free(local_copy);
     }
 }
 
 static void
 stonith_send_async_reply(async_command_t *cmd, const char *output, int rc, GPid pid)
 {
     xmlNode *reply = NULL;
     gboolean bcast = FALSE;
 
     reply = stonith_construct_async_reply(cmd, output, NULL, rc);
 
     if(safe_str_eq(cmd->action, "metadata")) {
         /* Too verbose to log */
         crm_trace("Metadata query for %s", cmd->device);
         output = NULL;
 
     } else if(crm_str_eq(cmd->action, "monitor", TRUE) ||
               crm_str_eq(cmd->action, "list", TRUE) ||
               crm_str_eq(cmd->action, "status", TRUE)) {
         crm_trace("Never broadcast %s replies", cmd->action);
 
     } else if(!stand_alone && safe_str_eq(cmd->origin, cmd->victim)) {
         crm_trace("Broadcast %s reply for %s", cmd->action, cmd->victim);
         crm_xml_add(reply, F_SUBTYPE, "broadcast");
         bcast = TRUE;
     }
 
     log_operation(cmd, rc, pid, NULL, output);
     crm_log_xml_trace(reply, "Reply");
 
     if(bcast) {
         crm_xml_add(reply, F_STONITH_OPERATION, T_STONITH_NOTIFY);
         send_cluster_message(NULL, crm_msg_stonith_ng, reply, FALSE);
 
     } else if(cmd->origin) {
         crm_trace("Directed reply to %s", cmd->origin);
         send_cluster_message(crm_get_peer(0, cmd->origin), crm_msg_stonith_ng, reply, FALSE);
 
     } else {
         crm_trace("Directed local %ssync reply to %s",
                   (cmd->options & st_opt_sync_call)?"":"a-", cmd->client_name);
         do_local_reply(reply, cmd->client, cmd->options & st_opt_sync_call, FALSE);
     }
 
     if(stand_alone) {
         /* Do notification with a clean data object */
         xmlNode *notify_data = create_xml_node(NULL, T_STONITH_NOTIFY_FENCE);
         crm_xml_add_int(notify_data, F_STONITH_RC,    rc);
         crm_xml_add(notify_data, F_STONITH_TARGET,    cmd->victim);
         crm_xml_add(notify_data, F_STONITH_OPERATION, cmd->op);
         crm_xml_add(notify_data, F_STONITH_DELEGATE,  cmd->device);
         crm_xml_add(notify_data, F_STONITH_REMOTE_OP_ID,    cmd->remote_op_id);
         crm_xml_add(notify_data, F_STONITH_ORIGIN,    cmd->client);
 
         do_stonith_notify(0, T_STONITH_NOTIFY_FENCE, rc, notify_data);
     }
 
     free_xml(reply);
 }
 
 
 static void cancel_stonith_command(async_command_t *cmd)
 {
     stonith_device_t *device;
 
     CRM_CHECK(cmd != NULL, return);
 
     if (!cmd->device) {
         return;
     }
 
     device = g_hash_table_lookup(device_list, cmd->device);
 
     if (device) {
         crm_trace("Cancel scheduled %s on %s", cmd->action, device->id);
         device->pending_ops = g_list_remove(device->pending_ops, cmd);
     }
 }
 
 #define READ_MAX 500
 static void st_child_done(GPid pid, int rc, const char *output, gpointer user_data)
 {
     stonith_device_t *device = NULL;
     async_command_t *cmd = user_data;
 
     GListPtr gIter = NULL;
     GListPtr gIterNext = NULL;
 
     CRM_CHECK(cmd != NULL, return);
 
     active_children--;
 
     /* The device is ready to do something else now */
     device = g_hash_table_lookup(device_list, cmd->device);
     if(device) {
         device->active_pid = 0;
         if (rc == pcmk_ok &&
             (safe_str_eq(cmd->action, "list") ||
              safe_str_eq(cmd->action, "monitor") ||
              safe_str_eq(cmd->action, "status"))) {
 
             device->verified = TRUE;
         }
 
         mainloop_set_trigger(device->work);
     }
 
     crm_trace("Operation %s on %s completed with rc=%d (%d remaining)",
               cmd->action, cmd->device, rc, g_list_length(cmd->device_next));
 
     if(rc != 0 && cmd->device_next) {
         stonith_device_t *dev = cmd->device_next->data;
 
         log_operation(cmd, rc, pid, dev->id, output);
 
         cmd->device_next = cmd->device_next->next;
         schedule_stonith_command(cmd, dev);
         /* Prevent cmd from being freed */
         cmd = NULL;
         goto done;
     }
 
     if(rc > 0) {
         rc = -pcmk_err_generic;
     }
 
     stonith_send_async_reply(cmd, output, rc, pid);
 
     if(rc != 0) {
         goto done;
     }
 
     /* Check to see if any operations are scheduled to do the exact
      * same thing that just completed.  If so, rather than
      * performing the same fencing operation twice, return the result
      * of this operation for all pending commands it matches. */
     for (gIter = cmd_list; gIter != NULL; gIter = gIterNext) {
         async_command_t *cmd_other = gIter->data;
         gIterNext = gIter->next;
 
         if(cmd == cmd_other) {
             continue;
         }
 
         /* A pending scheduled command matches the command that just finished if.
          * 1. The client connections are different.
          * 2. The node victim is the same.
          * 3. The fencing action is the same.
          * 4. The device scheduled to execute the action is the same. 
          */
         if(safe_str_eq(cmd->client, cmd_other->client) ||
             safe_str_neq(cmd->victim, cmd_other->victim) ||
             safe_str_neq(cmd->action, cmd_other->action) ||
             safe_str_neq(cmd->device, cmd_other->device)) {
 
             continue;
         }
 
         crm_notice("Merging stonith action %s for node %s originating from client %s with identical stonith request from client %s",
             cmd_other->action,
             cmd_other->victim,
             cmd_other->client_name,
             cmd->client_name);
 
         cmd_list = g_list_remove_link(cmd_list, gIter);
 
         stonith_send_async_reply(cmd_other, output, rc, pid);
         cancel_stonith_command(cmd_other);
 
         free_async_command(cmd_other);
         g_list_free_1(gIter);
     }
 
   done:
     free_async_command(cmd);
 }
 
 static gint sort_device_priority(gconstpointer a, gconstpointer b)
 {
     const stonith_device_t *dev_a = a;
     const stonith_device_t *dev_b = a;
     if(dev_a->priority > dev_b->priority) {
         return -1;
     } else if(dev_a->priority < dev_b->priority) {
         return 1;
     }
     return 0;
 }
 
 static int stonith_fence(xmlNode *msg)
 {
     int options = 0;
     const char *device_id = NULL;
     stonith_device_t *device = NULL;
     async_command_t *cmd = create_async_command(msg);
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);
 
     if(cmd == NULL) {
         return -EPROTO;
     }
 
     device_id = crm_element_value(dev, F_STONITH_DEVICE);
     if(device_id) {
         device = g_hash_table_lookup(device_list, device_id);
         if(device == NULL) {
             crm_err("Requested device '%s' is not available", device_id);
         }
 
     } else {
         struct device_search_s search;
 
         search.capable = NULL;
         search.host = crm_element_value(dev, F_STONITH_TARGET);
 
         crm_element_value_int(msg, F_STONITH_CALLOPTS, &options);
         if(options & st_opt_cs_nodeid) {
             int nodeid = crm_atoi(search.host, NULL);
             crm_node_t *node = crm_get_peer(nodeid, NULL);
             if(node) {
                 search.host = node->uname;
             }
         }
 
         g_hash_table_foreach(device_list, search_devices, &search);
         crm_info("Found %d matching devices for '%s'", g_list_length(search.capable), search.host);
 
         if(g_list_length(search.capable) > 0) {
             /* Order based on priority */
             search.capable = g_list_sort(search.capable, sort_device_priority);
 
             device = search.capable->data;
 
             if(g_list_length(search.capable) > 1) {
                 cmd->device_list = search.capable;
                 cmd->device_next = cmd->device_list->next;
             } else {
                 g_list_free(search.capable);
             }
         }
     }
 
     if(device) {
         schedule_stonith_command(cmd, device);
         return -EINPROGRESS;
     }
 
     free_async_command(cmd);
     return -EHOSTUNREACH;
 }
 
 xmlNode *stonith_construct_reply(xmlNode *request, char *output, xmlNode *data, int rc) 
 {
     int lpc = 0;
     xmlNode *reply = NULL;
 
     const char *name = NULL;
     const char *value = NULL;
     const char *names[] = {
         F_STONITH_OPERATION,
         F_STONITH_CALLID,
         F_STONITH_CLIENTID,
         F_STONITH_CLIENTNAME,
         F_STONITH_REMOTE_OP_ID,
         F_STONITH_CALLOPTS
     };
 
     crm_trace("Creating a basic reply");
     reply = create_xml_node(NULL, T_STONITH_REPLY);
 
     crm_xml_add(reply, "st_origin", __FUNCTION__);
     crm_xml_add(reply, F_TYPE, T_STONITH_NG);
     crm_xml_add(reply, "st_output", output);
     crm_xml_add_int(reply, F_STONITH_RC, rc);
 
     CRM_CHECK(request != NULL, crm_warn("Can't create a sane reply"); return reply);
     for(lpc = 0; lpc < DIMOF(names); lpc++) {
         name = names[lpc];
         value = crm_element_value(request, name);
         crm_xml_add(reply, name, value);
     }
 
     if(data != NULL) {
         crm_trace("Attaching reply output");
         add_message_xml(reply, F_STONITH_CALLDATA, data);
     }
     return reply;
 }
 
 static xmlNode *
 stonith_construct_async_reply(async_command_t *cmd, const char *output, xmlNode *data, int rc) 
 {
     xmlNode *reply = NULL;
 
     crm_trace("Creating a basic reply");
     reply = create_xml_node(NULL, T_STONITH_REPLY);
 
     crm_xml_add(reply, "st_origin", __FUNCTION__);
     crm_xml_add(reply, F_TYPE, T_STONITH_NG);
 
     crm_xml_add(reply, F_STONITH_OPERATION, cmd->op);
     crm_xml_add(reply, F_STONITH_DEVICE, cmd->device);
     crm_xml_add(reply, F_STONITH_REMOTE_OP_ID, cmd->remote_op_id);
     crm_xml_add(reply, F_STONITH_CLIENTID, cmd->client);
     crm_xml_add(reply, F_STONITH_CLIENTNAME, cmd->client_name);
     crm_xml_add(reply, F_STONITH_TARGET, cmd->victim);
     crm_xml_add(reply, F_STONITH_ACTION, cmd->op);
     crm_xml_add(reply, F_STONITH_ORIGIN, cmd->origin);
     crm_xml_add_int(reply, F_STONITH_CALLID, cmd->id);
     crm_xml_add_int(reply, F_STONITH_CALLOPTS, cmd->options);
 
 
     crm_xml_add_int(reply, F_STONITH_RC, rc);
 
     crm_xml_add(reply, "st_output", output);
 
     if(data != NULL) {
         crm_info("Attaching reply output");
         add_message_xml(reply, F_STONITH_CALLDATA, data);
     }
     return reply;
 }
 
 /*!
  * \internal
  * \brief Determine if we need to use an alternate node to
  * fence the target. If so return that node's uname
  *
  * \retval NULL, no alternate host
  * \retval uname, uname of alternate host to use
  */
 static const char *
 check_alternate_host(const char *target)
 {
     const char *alternate_host = NULL;
 
     if(g_hash_table_lookup(topology, target) && safe_str_eq(target, stonith_our_uname)) {
         GHashTableIter gIter;
         crm_node_t *entry = NULL;
         int membership = crm_proc_plugin | crm_proc_heartbeat | crm_proc_cpg;
 
         g_hash_table_iter_init(&gIter, crm_peer_cache);
         while (g_hash_table_iter_next(&gIter, NULL, (void **)&entry)) {
             crm_trace("Checking for %s.%d != %s",
                       entry->uname, entry->id, target);
             if(entry->uname
                && (entry->processes & membership)
                && safe_str_neq(entry->uname, target)) {
                 alternate_host = entry->uname;
                 break;
             }
         }
         if(alternate_host == NULL) {
             crm_err("No alternate host available to handle complex self fencing request");
             g_hash_table_iter_init(&gIter, crm_peer_cache);
             while (g_hash_table_iter_next(&gIter, NULL, (void **)&entry)) {
                 crm_notice("Peer[%d] %s", entry->id, entry->uname);
             }
         }
     }
 
     return alternate_host;
 }
 
 static int
 handle_request(stonith_client_t *client, uint32_t id, uint32_t flags, xmlNode *request, const char *remote_peer)
 {
     int call_options = 0;
     int rc = -EOPNOTSUPP;
 
     gboolean always_reply = FALSE;
 
     xmlNode *reply = NULL;
     xmlNode *data = NULL;
 
     char *output = NULL;
     const char *op = crm_element_value(request, F_STONITH_OPERATION);
     const char *client_id = crm_element_value(request, F_STONITH_CLIENTID);
 
     crm_element_value_int(request, F_STONITH_CALLOPTS, &call_options);
 
     if(is_set(call_options, st_opt_sync_call)) {
         CRM_ASSERT(client == NULL || client->request_id == id);
     }
 
     if(crm_str_eq(op, CRM_OP_REGISTER, TRUE)) {
         xmlNode *reply = create_xml_node(NULL, "reply");
 
         CRM_ASSERT(client);
         crm_xml_add(reply, F_STONITH_OPERATION, CRM_OP_REGISTER);
         crm_xml_add(reply, F_STONITH_CLIENTID,  client->id);
         crm_ipcs_send(client->channel, id, reply, FALSE);
         client->request_id = 0;
         free_xml(reply);
         return 0;
 
     } else if(crm_str_eq(op, STONITH_OP_EXEC, TRUE)) {
         rc = stonith_device_action(request, &output);
 
     } else if (crm_str_eq(op, STONITH_OP_TIMEOUT_UPDATE, TRUE)) {
         const char *call_id = crm_element_value(request, F_STONITH_CALLID);
         const char *client_id = crm_element_value(request, F_STONITH_CLIENTID);
         int op_timeout = 0;
 
         crm_element_value_int(request, F_STONITH_TIMEOUT, &op_timeout);
         do_stonith_async_timeout_update(client_id, call_id, op_timeout);
         return 0;
 
     } else if(crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
         if (remote_peer) {
             create_remote_stonith_op(client_id, request, TRUE); /* Record it for the future notification */
         }
         rc = stonith_query(request, &data);
         always_reply = TRUE;
         if(!data) {
             return 0;
         }
 
     } else if(crm_str_eq(op, T_STONITH_NOTIFY, TRUE)) {
         const char *flag_name = NULL;
 
         CRM_ASSERT(client);
         flag_name = crm_element_value(request, F_STONITH_NOTIFY_ACTIVATE);
         if(flag_name) {
             crm_debug("Setting %s callbacks for %s (%s): ON",
                       flag_name, client->name, client->id);
             client->flags |= get_stonith_flag(flag_name);
         }
 
         flag_name = crm_element_value(request, F_STONITH_NOTIFY_DEACTIVATE);
         if(flag_name) {
             crm_debug("Setting %s callbacks for %s (%s): off",
                       flag_name, client->name, client->id);
             client->flags |= get_stonith_flag(flag_name);
         }
 
         if(flags & crm_ipc_client_response) {
             crm_ipcs_send_ack(client->channel, id, "ack", __FUNCTION__, __LINE__);
             client->request_id = 0;
         }
         return 0;
 
     } else if(crm_str_eq(op, STONITH_OP_RELAY, TRUE)) {
         xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, request, LOG_TRACE);
         crm_notice("Peer %s has received a forwarded fencing request from %s to fence (%s) peer %s",
             stonith_our_uname,
             client ? client->name : remote_peer,
             crm_element_value(dev, F_STONITH_ACTION),
             crm_element_value(dev, F_STONITH_TARGET));
 
         if(initiate_remote_stonith_op(NULL, request, FALSE) != NULL) {
             rc = -EINPROGRESS;
         }
 
     } else if(crm_str_eq(op, STONITH_OP_FENCE, TRUE)) {
 
         if(remote_peer || stand_alone) {
             rc = stonith_fence(request);
 
         } else if(call_options & st_opt_manual_ack) {
             remote_fencing_op_t *rop = initiate_remote_stonith_op(client, request, TRUE);
             rc = stonith_manual_ack(request, rop);
 
         } else {
             const char *alternate_host = NULL;
             xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, request, LOG_TRACE);
             const char *target = crm_element_value(dev, F_STONITH_TARGET);
             const char *action = crm_element_value(dev, F_STONITH_ACTION);
             const char *device = crm_element_value(dev, F_STONITH_DEVICE);
 
             if(client) {
                 int tolerance = 0;
 
                 crm_notice("Client %s.%.8s wants to fence (%s) '%s' with device '%s'",
                            client->name, client->id, action, target, device?device:"(any)");
 
                 crm_element_value_int(dev, F_STONITH_TOLERANCE, &tolerance);
 
                 if(stonith_check_fence_tolerance(tolerance, target, action)) {
                     rc = 0;
                     goto done;
                 }
 
             } else {
                 crm_notice("Peer %s wants to fence (%s) '%s' with device '%s'",
                            remote_peer, action, target, device?device:"(any)");
             }
 
             alternate_host = check_alternate_host(target);
 
             if(alternate_host) {
                 crm_notice("Forwarding complex self fencing request to peer %s", alternate_host);
                 crm_xml_add(request, F_STONITH_OPERATION, STONITH_OP_RELAY);
                 crm_xml_add(request, F_STONITH_CLIENTID, client->id);
                 send_cluster_message(crm_get_peer(0, alternate_host), crm_msg_stonith_ng, request, FALSE);
                 rc = -EINPROGRESS;
 
             } else if(initiate_remote_stonith_op(client, request, FALSE) != NULL) {
                 rc = -EINPROGRESS;
             }
         }
 
     } else if (crm_str_eq(op, STONITH_OP_FENCE_HISTORY, TRUE)) {
         rc = stonith_fence_history(request, &data);
         always_reply = TRUE;
 
     } else if(crm_str_eq(op, STONITH_OP_DEVICE_ADD, TRUE)) {
         const char *id = NULL;
         xmlNode *notify_data = create_xml_node(NULL, op);
         rc = stonith_device_register(request, &id);
 
         crm_xml_add(notify_data, F_STONITH_DEVICE, id);
         crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(device_list));
 
         do_stonith_notify(call_options, op, rc, notify_data);
         free_xml(notify_data);
 
     } else if(crm_str_eq(op, STONITH_OP_DEVICE_DEL, TRUE)) {
         xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, request, LOG_ERR);
         const char *id = crm_element_value(dev, XML_ATTR_ID);
         xmlNode *notify_data = create_xml_node(NULL, op);
 
         rc = stonith_device_remove(id);
 
         crm_xml_add(notify_data, F_STONITH_DEVICE, id);
         crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(device_list));
 
         do_stonith_notify(call_options, op, rc, notify_data);
         free_xml(notify_data);
 
     } else if(crm_str_eq(op, STONITH_OP_LEVEL_ADD, TRUE)) {
         char *id = NULL;
         xmlNode *notify_data = create_xml_node(NULL, op);
         rc = stonith_level_register(request, &id);
 
         crm_xml_add(notify_data, F_STONITH_DEVICE, id);
         crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(topology));
 
         do_stonith_notify(call_options, op, rc, notify_data);
         free_xml(notify_data);
 
     } else if(crm_str_eq(op, STONITH_OP_LEVEL_DEL, TRUE)) {
         char *id = NULL;
         xmlNode *notify_data = create_xml_node(NULL, op);
         rc = stonith_level_remove(request, &id);
 
         crm_xml_add(notify_data, F_STONITH_DEVICE, id);
         crm_xml_add_int(notify_data, F_STONITH_ACTIVE, g_hash_table_size(topology));
 
         do_stonith_notify(call_options, op, rc, notify_data);
         free_xml(notify_data);
 
     } else if(crm_str_eq(op, STONITH_OP_CONFIRM, TRUE)) {
         async_command_t *cmd = create_async_command(request);
         xmlNode *reply = stonith_construct_async_reply(cmd, NULL, NULL, 0);
 
         crm_xml_add(reply, F_STONITH_OPERATION, T_STONITH_NOTIFY);
         crm_notice("Broadcasting manual fencing confirmation for node %s", cmd->victim);
         send_cluster_message(NULL, crm_msg_stonith_ng, reply, FALSE);
 
         free_async_command(cmd);
         free_xml(reply);
 
     } else {
         crm_err("Unknown %s from %s", op, client ? client->name : remote_peer);
         crm_log_xml_warn(request, "UnknownOp");
     }
 
   done:
     if (rc == -EINPROGRESS) {
         /* Nothing (yet) */
 
     } else if(remote_peer) {
         reply = stonith_construct_reply(request, output, data, rc);
         send_cluster_message(crm_get_peer(0, remote_peer), crm_msg_stonith_ng, reply, FALSE);
         free_xml(reply);
 
     } else if(rc <= pcmk_ok || always_reply) {
         reply = stonith_construct_reply(request, output, data, rc);
         do_local_reply(reply, client_id, call_options & st_opt_sync_call, remote_peer!=NULL);
         free_xml(reply);
     }
 
     free(output);
     free_xml(data);
 
     return rc;
 }
 
 static void
 handle_reply(stonith_client_t *client, xmlNode *request, const char *remote_peer)
 {
     const char *op = crm_element_value(request, F_STONITH_OPERATION);
 
     if(crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
         process_remote_stonith_query(request);
     } else if(crm_str_eq(op, T_STONITH_NOTIFY, TRUE)) {
         process_remote_stonith_exec(request);
     } else if(crm_str_eq(op, STONITH_OP_FENCE, TRUE)) {
         /* Reply to a complex fencing op */
         process_remote_stonith_exec(request);
     } else {
         crm_err("Unknown %s reply from %s", op, client ? client->name : remote_peer);
         crm_log_xml_warn(request, "UnknownOp");
     }
 }
 
 void
 stonith_command(stonith_client_t *client, uint32_t id, uint32_t flags, xmlNode *request, const char *remote_peer)
 {
     int call_options = 0;
     int rc = 0;
     gboolean is_reply = FALSE;
     const char *op = crm_element_value(request, F_STONITH_OPERATION);
 
     if(get_xpath_object("//"T_STONITH_REPLY, request, LOG_DEBUG_3)) {
         is_reply = TRUE;
     }
 
     crm_element_value_int(request, F_STONITH_CALLOPTS, &call_options);
     crm_debug("Processing %s%s from %s (%16x)", op, is_reply?" reply":"",
               client?client->name:remote_peer, call_options);
 
     if(is_set(call_options, st_opt_sync_call)) {
         CRM_ASSERT(client == NULL || client->request_id == id);
     }
 
     if (is_reply) {
         handle_reply(client, request, remote_peer);
     } else {
         rc = handle_request(client, id, flags, request, remote_peer);
     }
 
     do_crm_log_unlikely(rc>0?LOG_DEBUG:LOG_INFO,"Processed %s%s from %s: %s (%d)", op, is_reply?" reply":"",
                client?client->name:remote_peer, rc>0?"":pcmk_strerror(rc), rc);
 
 }