diff --git a/fencing/commands.c b/fencing/commands.c
index 4abce6b60e..13d581c922 100644
--- a/fencing/commands.c
+++ b/fencing/commands.c
@@ -1,1211 +1,1201 @@
 /* 
  * 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/common/cluster.h>
 #include <crm/common/mainloop.h>
 
 #include <crm/stonith-ng.h>
 #include <crm/stonith-ng-internal.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 #include <internal.h>
 
 #include <clplumbing/proctrack.h>
 
 GHashTable *device_list = NULL;
 GHashTable *topology = NULL;
 
 static int active_children = 0;
 
 static gboolean stonith_device_dispatch(gpointer user_data);
-static void exec_child_done(ProcTrack* proc, int status, int signo, int rc, int waslogged);
-static void exec_child_new(ProcTrack* p) { active_children++; }
-static const char *exec_child_name(ProcTrack* p) {
-    async_command_t *cmd = proctrack_data(p);
-    return cmd->client?cmd->client:cmd->remote;
-}
-
-static ProcTrack_ops StonithdProcessTrackOps = {
-	exec_child_done,
-	exec_child_new,
-	exec_child_name,
-};
+static void st_child_done(GPid pid, gint status, gpointer user_data);
 
 
 static void free_async_command(async_command_t *cmd) 
 {
     crm_free(cmd->device);
     crm_free(cmd->action);
     crm_free(cmd->victim);
     crm_free(cmd->remote);
     crm_free(cmd->client);
     crm_free(cmd->origin);
     crm_free(cmd->op);
     crm_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");
     crm_malloc0(cmd, 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->timeout));
 
     cmd->timeout *= 1000;
     cmd->origin = crm_element_value_copy(msg, F_ORIG);
     cmd->remote = crm_element_value_copy(msg, F_STONITH_REMOTE);
     cmd->client = crm_element_value_copy(msg, F_STONITH_CLIENTID);
     cmd->op     = crm_element_value_copy(msg, F_STONITH_OPERATION);
     cmd->action = crm_strdup(action);
     cmd->victim = crm_element_value_copy(op, F_STONITH_TARGET);
-    cmd->pt_ops = &StonithdProcessTrackOps;
+    cmd->done   = st_child_done;
 
     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"));
     return cmd;
 }
 
 static int stonith_manual_ack(xmlNode *msg, remote_fencing_op_t *op) 
 {
-    struct _ProcTrack p;
     async_command_t *cmd = create_async_command(msg);
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);
     
     if(cmd == NULL) {
 	return st_err_missing;
     }
 
     cmd->device = crm_strdup("manual_ack");
     cmd->remote = crm_strdup(op->id);
     
     crm_notice("Injecting manual confirmation that %s is safely off/down",
                crm_element_value(dev, F_STONITH_TARGET));
 
-    memset(&p, 0, sizeof(struct _ProcTrack));
-    p.privatedata = cmd;
-
-    exec_child_done(&p, 0, 0, 0, FALSE);
+    st_child_done(0, 0, cmd);
     return stonith_ok;
 }
 
 static gboolean stonith_device_execute(stonith_device_t *device)
 {
     int rc = 0;
     int exec_rc = 0;
     async_command_t *cmd = 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;
     }
     
     cmd->device = crm_strdup(device->id);
     exec_rc = run_stonith_agent(device->agent, cmd->action, cmd->victim,
 				device->params, device->aliases, &rc, NULL, cmd);
 
     if(exec_rc > 0) {
 	crm_debug("Operation %s%s%s on %s is active with pid: %d",
 		  cmd->action, cmd->victim?" for node ":"", cmd->victim?cmd->victim:"",
 		  device->id, exec_rc);
 	device->active_pid = exec_rc;
 	
     } else {
-	struct _ProcTrack p;
-	memset(&p, 0, sizeof(struct _ProcTrack));
-	p.privatedata = cmd;
-	
 	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);
-	exec_child_done(&p, 0, 0, rc<0?rc:exec_rc, 0);
+	st_child_done(0, rc<0?rc:exec_rc, 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);
 
     crm_trace("Scheduling %s on %s", cmd->action, device->id);
     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) {
-	struct _ProcTrack p;
 	async_command_t *cmd = gIter->data;
-
-	memset(&p, 0, sizeof(struct _ProcTrack));
-	p.privatedata = cmd;
 	
 	crm_warn("Removal of device '%s' purged operation %s", device->id, cmd->action);
-	exec_child_done(&p, 0, 0, st_err_unknown_device, 0);
+	st_child_done(0, st_err_unknown_device, cmd);
 	free_async_command(cmd);
     }
     g_list_free(device->pending_ops);
 
     slist_basic_destroy(device->targets);
     crm_free(device->namespace);
     crm_free(device->agent);
     crm_free(device->id);
     crm_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) {
 		    crm_free(name);
 		    crm_malloc0(name, 1 + lpc - last);
 		    strncpy(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;
 		    crm_malloc0(value, 1 + lpc - last);
 		    strncpy(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, crm_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);
     }
     
     crm_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) {
                 crm_malloc0(entry, 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;
 	    }
 	    
 	    crm_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;
 
 	    crm_malloc0(line, 2 + lpc - last);
 	    snprintf(line, 1 + lpc - last, "%s", hosts+last);
 	    parse_host_line(line, &output);
 	    crm_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;
 
     crm_malloc0(device, 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;
 }
 
 int stonith_device_register(xmlNode *msg) 
 {
     const char *value = 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));
 
     g_hash_table_replace(device_list, device->id, device);
 
     crm_info("Added '%s' to the device list (%d active devices)", device->id, g_hash_table_size(device_list));
     return stonith_ok;
 }
 
 
 
 static int stonith_device_remove(xmlNode *msg) 
 {
     xmlNode *dev = get_xpath_object("//"F_STONITH_DEVICE, msg, LOG_ERR);
     const char *id = crm_element_value(dev, XML_ATTR_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 stonith_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) {
             slist_basic_destroy(tp->levels[lpc]);
         }
     }
     crm_free(tp->node);
     crm_free(tp);
 }
 
 int stonith_level_register(xmlNode *msg) 
 {
     int id = 0;
     int rc = stonith_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(id <= 0 || id >= ST_LEVEL_MAX) {
         return st_err_invalid_level;
     }
     
     if(tp == NULL) {
         crm_malloc0(tp, sizeof(stonith_topology_t));
         tp->node = crm_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], crm_strdup(device));
     }
     
     crm_info("Node %s has %d active fencing levels", node, count_active_levels(tp));
     return rc;
 }
 
 int stonith_level_remove(xmlNode *msg) 
 {
     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(tp == NULL) {
 	crm_info("Node %s not found (%d active entries)",
 		 node, g_hash_table_size(topology));
         return stonith_ok;
     }
 
     crm_element_value_int(level, XML_ATTR_ID, &id);
     if(id < 0 || id >= ST_LEVEL_MAX) {
         return st_err_invalid_level;
     }
 
     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) {
         slist_basic_destroy(tp->levels[id]);
         tp->levels[id] = NULL;
 
 	crm_info("Removed entry '%d' from %s's topology (%d active entries remaining)",
 		 id, node, count_active_levels(tp));
     }    
     return stonith_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 = stonith_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 st_err_internal;
 	}
 
 	schedule_stonith_command(cmd, device);
 	rc = stonith_pending;
 	
     } else {
 	crm_notice("Device %s not found", id?id:"<none>");
 	rc = st_err_unknown_device;
     }
     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 = 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 {
 	    check_type = "dynamic-list";
 	}
     }
     
     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(safe_str_eq(check_type, "dynamic-list")) {
 	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) {
 	    char *output = NULL;
 	    int rc = stonith_ok;
 	    int exec_rc = stonith_ok;
 	    
 	    /* Check for the target's presence in the output of the 'list' command */
 	    slist_basic_destroy(dev->targets);
 	    dev->targets = NULL;
 	    
 	    exec_rc = run_stonith_agent(dev->agent, "list", NULL, dev->params, NULL, &rc, &output, NULL);
             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, crm_strdup(STONITH_ATTR_HOSTCHECK), crm_strdup("status"));
 		
 	    } else {
 		crm_info("Refreshing port list for %s", dev->id);
 		dev->targets = parse_host_list(output);
 		dev->targets_age = now;
 	    }
 	
 	    crm_free(output);
 	}
 	
 	if(string_in_list(dev->targets, alias)) {
 	    can = TRUE;
 	}
 
     } else if(safe_str_eq(check_type, "status")) {
 	int rc = 0;
 	int exec_rc = 0;
 
 	/* 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
 	 */
 
 	exec_rc = run_stonith_agent(
 	    dev->agent, "status", host, dev->params, dev->aliases, &rc, NULL, 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;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, 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 stonith_ok;
         }
     }
     
     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;
 	    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);
 	    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;
 }
 
 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",
 		   cmd->action, pid, cmd->id, cmd->client, cmd->victim, cmd->device, rc,
 		   next?". Trying: ":"", next?next:"");
     } else {
 	do_crm_log(rc==0?LOG_DEBUG:LOG_NOTICE,
 		   "Operation '%s' [%d] for device '%s' returned: %d%s%s",
 		   cmd->action, pid, cmd->device, rc, next?". Trying: ":"", next?next:"");
     }
 
     if(output) {
 	/* Logging the whole string confuses syslog when the string is xml */ 
 	char *local_copy = crm_strdup(output);
 	int lpc = 0, last = 0, more = strlen(local_copy);
 	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_ERR, "%s: %s",
 			   cmd->device, local_copy+last);
 		last = lpc+1;
 	    }
 	}
 	crm_debug("%s: %s (total %d bytes)", cmd->device, local_copy+last, more);
 	crm_free(local_copy);
     }
 }
 
 #define READ_MAX 500
-static void
-exec_child_done(ProcTrack* proc, int status, int signum, int rc, int waslogged)
+static void st_child_done(GPid pid, gint status, gpointer user_data) 
 {
+    int rc = st_err_generic;
+
     int len = 0;
     int more = 0;
     gboolean bcast = FALSE;
     
     char *output = NULL;  
     xmlNode *data = NULL;
     xmlNode *reply = NULL;
 
-    int pid = proctrack_pid(proc);
     stonith_device_t *device = NULL;
-    async_command_t *cmd = proctrack_data(proc);
+    async_command_t *cmd = user_data;
     
     CRM_CHECK(cmd != NULL, return);
+
+    g_source_remove(cmd->timer_sigterm);
+    g_source_remove(cmd->timer_sigkill);
+    
+    if(WIFSIGNALED(status)) {
+        int signo = WTERMSIG(status);
+
+        if(signo) {
+            if(signo == SIGTERM || signo == SIGKILL) {
+                rc = st_err_timeout;
+            } else {
+                rc = st_err_signal;
+            }
+        }
+        crm_notice("Child process %s performing action '%s' with '%s' terminated with signal %d",
+                   pid, cmd->action, cmd->device, signo);
+
+    } else if(WIFEXITED(status)) {
+        rc = WEXITSTATUS(status);
+        crm_debug("Child process %s performing action '%s' with '%s' exited with rc %d",
+                  pid, cmd->action, cmd->device, rc);
+    }
+    
     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;
 	mainloop_set_trigger(device->work);
     }
 
-    if( signum ) {
-	rc = st_err_signal;
-	if( proctrack_timedout(proc) ) {
-	    crm_warn("Child '%d' performing action '%s' with '%s' timed out",
-		     pid, cmd->action, cmd->device);
-	    rc = st_err_timeout;
-	}
-    }
-
     do {
 	char buffer[READ_MAX];
 
 	errno = 0;
 	if(cmd->stdout > 0) {
 	    memset(&buffer, 0, READ_MAX);
 	    more = read(cmd->stdout, buffer, READ_MAX-1);
 	    crm_trace("Got %d more bytes: %s", more, buffer);
 	}
 	
 	if(more > 0) {
 	    crm_realloc(output, len + more + 1);
 	    sprintf(output+len, "%s", buffer);
 	    len += more;
 	}
 	
     } while (more == (READ_MAX-1) || (more < 0 && errno == EINTR));
 
     if(cmd->stdout) {
 	close(cmd->stdout);
 	cmd->stdout = 0;
     }
 
     crm_trace("Operation on %s completed with rc=%d (%d remaining)",
               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);
 	goto done;
     }
 
     if(rc > 0) {
 	rc = st_err_generic;
     }
     
     reply = stonith_construct_async_reply(cmd, output, data, rc);
     if(safe_str_eq(cmd->action, "metadata")) {
 	/* Too verbose to log */
 	crm_free(output); output = NULL;
 
     } else if(crm_str_eq(cmd->action, "reboot", TRUE)
 	   || crm_str_eq(cmd->action, "poweroff", TRUE)
 	   || crm_str_eq(cmd->action, "poweron", TRUE)
 	   || crm_str_eq(cmd->action, "off", TRUE)
 	   || crm_str_eq(cmd->action, "on", TRUE)) {
         /* TODO: Invert this logic */
 	bcast = TRUE;
     }
 
     log_operation(cmd, rc, pid, NULL, output);
     crm_log_xml_trace(reply, "Reply");
     
     if(bcast && !stand_alone) {
 	/* Send reply as T_STONITH_NOTIFY so everyone does notifications
 	 * Potentially limit to unsucessful operations to the originator?
 	 */
 	crm_xml_add(reply, F_STONITH_OPERATION, T_STONITH_NOTIFY);
 	send_cluster_message(NULL, crm_msg_stonith_ng, reply, FALSE);
 
     } else if(cmd->origin) {
 	send_cluster_message(cmd->origin, crm_msg_stonith_ng, reply, FALSE);
 
     } else {
 	do_local_reply(reply, cmd->client, cmd->options & st_opt_sync_call, FALSE);
     }
     
     free_async_command(cmd);
   done:
 
-    reset_proctrack_data(proc);
     crm_free(output);
     free_xml(reply);
     free_xml(data);
 }
 
 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;
     struct device_search_s search;
     stonith_device_t *device = NULL;
     async_command_t *cmd = create_async_command(msg);
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);
 
     crm_log_xml_trace(msg, "Exec");
     
     if(cmd == NULL) {
 	return st_err_internal;
     }
 
     device_id = crm_element_value(dev, F_STONITH_DEVICE);
     if(device_id) {
         device = g_hash_table_lookup(device_list, device_id);
         
     } else {
         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;
 
             /* TODO: Shouldn't we remove the element here? */
             if(g_list_length(search.capable) > 1) {
                 cmd->device_list = search.capable;
             }
         }
     }
 
     if(device) {
         cmd->device = device->id;
         schedule_stonith_command(cmd, device);
         return stonith_pending;
     }
 
     free_async_command(cmd);	
     return st_err_none_available;
 }
 
 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_REMOTE,
 	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;
 }
 
 xmlNode *stonith_construct_async_reply(async_command_t *cmd, 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_REMOTE, cmd->remote);
     crm_xml_add(reply, F_STONITH_CLIENTID, cmd->client);
     crm_xml_add(reply, F_STONITH_TARGET, cmd->victim);
     crm_xml_add(reply, F_STONITH_ACTION, cmd->op);
     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;
 }
 
 void
 stonith_command(stonith_client_t *client, xmlNode *request, const char *remote)
 {
     int call_options = 0;
     int rc = st_err_generic;
 
     gboolean is_reply = FALSE;
     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(get_xpath_object("//"T_STONITH_REPLY, request, LOG_DEBUG_3)) {
 	is_reply = TRUE;
     }
     
     crm_debug("Processing %s%s from %s (%16x)", op, is_reply?" reply":"",
 	      client?client->name:remote, call_options);
 
     if(crm_str_eq(op, CRM_OP_REGISTER, TRUE)) {
         xmlNode *reply = create_xml_node(NULL, "reply");
         crm_xml_add(reply, F_STONITH_OPERATION, CRM_OP_REGISTER);
         crm_xml_add(reply, F_STONITH_CLIENTID,  client->id);
 	crm_ipcs_send(client->channel, reply, FALSE);
         free_xml(reply);
         return;
 
     } else if(crm_str_eq(op, STONITH_OP_EXEC, TRUE)) {
 	rc = stonith_device_action(request, &output);
 
     } else if(is_reply && crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
 	process_remote_stonith_query(request);
 	return;
 	
     } else if(crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
 	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;
         }
         
     } else if(is_reply && crm_str_eq(op, T_STONITH_NOTIFY, TRUE)) {
 	process_remote_stonith_exec(request);
 	return;
 	
     } else if(crm_str_eq(op, T_STONITH_NOTIFY, TRUE)) {
 	const char *flag_name = NULL;
 
 	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);
 	}
 
         crm_ipcs_send_ack(client->channel, "ack", __FUNCTION__, __LINE__);
 	return;
 
     /* } else if(is_reply && crm_str_eq(op, STONITH_OP_FENCE, TRUE)) { */
     /* 	process_remote_stonith_exec(request); */
     /* 	return; */
 
     } else if(is_reply == FALSE && crm_str_eq(op, STONITH_OP_FENCE, TRUE)) {
 
         if(remote || 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 if(call_options & st_opt_local_first) {
 	    rc = stonith_fence(request);
 	    if(rc < 0) {
 		initiate_remote_stonith_op(client, request, FALSE);
                 if((call_options & st_opt_sync_call) == 0) {
                     crm_ipcs_send_ack(client->channel, "ack", __FUNCTION__, __LINE__);
                 }
 		return;
 	    }
 
 	} else {
 	    initiate_remote_stonith_op(client, request, FALSE);
             if((call_options & st_opt_sync_call) == 0) {
                 crm_ipcs_send_ack(client->channel, "ack", __FUNCTION__, __LINE__);
             }
 	    return;
 	}
 
     } 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, CRM_OP_REGISTER, TRUE)) {
 	return;
 	    
     } else if(crm_str_eq(op, STONITH_OP_DEVICE_ADD, TRUE)) {
 	rc = stonith_device_register(request);
 	do_stonith_notify(call_options, op, rc, request, NULL);
 
     } else if(crm_str_eq(op, STONITH_OP_DEVICE_DEL, TRUE)) {
 	rc = stonith_device_remove(request);
 	do_stonith_notify(call_options, op, rc, request, NULL);
 
     } else if(crm_str_eq(op, STONITH_OP_LEVEL_ADD, TRUE)) {
 	rc = stonith_level_register(request);
 	do_stonith_notify(call_options, op, rc, request, NULL);
 
     } else if(crm_str_eq(op, STONITH_OP_LEVEL_DEL, TRUE)) {
 	rc = stonith_level_remove(request);
 	do_stonith_notify(call_options, op, rc, request, NULL);
 
     } 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%s from %s", op, is_reply?" reply":"",
 		 client?client->name:remote);
 	crm_log_xml_warn(request, "UnknownOp");
     }
 
     do_crm_log(rc>0?LOG_DEBUG:LOG_INFO,"Processed %s%s from %s: rc=%d", op, is_reply?" reply":"",
 	       client?client->name:remote, rc);
     
     if(is_reply || rc == stonith_pending) {
 	/* Nothing (yet) */
 	
     } else if(remote) {
 	reply = stonith_construct_reply(request, output, data, rc);
 	send_cluster_message(remote, crm_msg_stonith_ng, reply, FALSE);
 	free_xml(reply);
 
     } else if(rc <= stonith_ok || always_reply) {
 	reply = stonith_construct_reply(request, output, data, rc);
 	do_local_reply(reply, client_id, call_options & st_opt_sync_call, remote!=NULL);
 	free_xml(reply);
     }
 
     crm_free(output);
     free_xml(data);
 }
diff --git a/fencing/main.c b/fencing/main.c
index 0d47a24e06..18c3575b2e 100644
--- a/fencing/main.c
+++ b/fencing/main.c
@@ -1,829 +1,826 @@
 /* 
  * 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/stat.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 
 #include <crm/crm.h>
 #include <crm/msg_xml.h>
 #include <crm/common/ipc.h>
 #include <crm/common/cluster.h>
 
 #include <crm/stonith-ng.h>
 #include <crm/stonith-ng-internal.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 #include <crm/common/mainloop.h>
 
 #include <crm/cib.h>
 
 #include <internal.h>
 
 #include <standalone_config.h>
 
 char *channel1 = NULL;
 char *channel2 = NULL;
 char *stonith_our_uname = NULL;
 
 GMainLoop *mainloop = NULL;
 GHashTable *client_list = NULL;
 
 gboolean stand_alone = FALSE;
 gboolean stonith_shutdown_flag = FALSE;
 
 #if SUPPORT_HEARTBEAT
 ll_cluster_t *hb_conn = NULL;
 #endif
 
 static int32_t
 st_ipc_accept(qb_ipcs_connection_t *c, uid_t uid, gid_t gid)
 {
     crm_trace("Connecting %p for uid=%d gid=%d", c, uid, gid);
     if(stonith_shutdown_flag) {
 	crm_info("Ignoring new client [%d] during shutdown", crm_ipcs_client_pid(c));
 	return -EPERM;
     }
     return 0;
 }
 
 static void
 st_ipc_created(qb_ipcs_connection_t *c)
 {
     stonith_client_t *new_client = NULL;
 
 #if 0
     struct qb_ipcs_stats srv_stats;
 
     qb_ipcs_stats_get(s1, &srv_stats, QB_FALSE);
     qb_log(LOG_INFO, "Connection created (active:%d, closed:%d)",
            srv_stats.active_connections,
            srv_stats.closed_connections);
 #endif
 
     crm_malloc0(new_client, sizeof(stonith_client_t));
     new_client->channel = c;
     new_client->channel_name = crm_strdup("ipc");
 	
     CRM_CHECK(new_client->id == NULL, crm_free(new_client->id));
     new_client->id = crm_generate_uuid();
     crm_trace("Created channel %p for client %s", c, new_client->id);
 	
     /* make sure we can find ourselves later for sync calls
      * redirected to the master instance
      */
     g_hash_table_insert(client_list, new_client->id, new_client);
     qb_ipcs_context_set(c, new_client);
 }
 
 /* Exit code means? */
 static int32_t
 st_ipc_dispatch(qb_ipcs_connection_t *c, void *data, size_t size)
 {
     xmlNode *request = NULL;
     stonith_client_t *client = (stonith_client_t*)qb_ipcs_context_get(c);
     
     CRM_CHECK(client != NULL, crm_err("Invalid client"); return FALSE);
     CRM_CHECK(client->id != NULL, crm_err("Invalid client: %p", client); return FALSE);
 
     request = crm_ipcs_recv(c, data, size);
     if (request == NULL) {
         return 0;
     }
 
     if(client->name == NULL) {
         const char *value = crm_element_value(request, F_STONITH_CLIENTNAME);
         if(value == NULL) {
             client->name = crm_itoa(crm_ipcs_client_pid(c));
         } else {
             client->name = crm_strdup(value);
         }
     }
 
     crm_xml_add(request, F_STONITH_CLIENTID, client->id);
     crm_xml_add(request, F_STONITH_CLIENTNAME, client->name);
     
     crm_log_xml_trace(request, "Client[inbound]");
     stonith_command(client, request, NULL);    
     free_xml(request);
     
     return 0;
 }
 
 /* Error code means? */
 static int32_t
 st_ipc_closed(qb_ipcs_connection_t *c) 
 {
     stonith_client_t *client = (stonith_client_t*)qb_ipcs_context_get(c);
 
 #if 0
     qb_ipcs_stats_get(s1, &srv_stats, QB_FALSE);
     qb_ipcs_connection_stats_get(c, &stats, QB_FALSE);
     qb_log(LOG_INFO, "Connection to pid:%d destroyed (active:%d, closed:%d)",
            stats.client_pid,
            srv_stats.active_connections,
            srv_stats.closed_connections);
 
     qb_log(LOG_DEBUG, " Requests %"PRIu64"", stats.requests);
     qb_log(LOG_DEBUG, " Responses %"PRIu64"", stats.responses);
     qb_log(LOG_DEBUG, " Events %"PRIu64"", stats.events);
     qb_log(LOG_DEBUG, " Send retries %"PRIu64"", stats.send_retries);
     qb_log(LOG_DEBUG, " Recv retries %"PRIu64"", stats.recv_retries);
     qb_log(LOG_DEBUG, " FC state %d", stats.flow_control_state);
     qb_log(LOG_DEBUG, " FC count %"PRIu64"", stats.flow_control_count);
 #endif
 
     if (client == NULL) {
 	crm_err("No client");
 	return 0;
     }
     
     crm_trace("Cleaning up after client disconnect: %p/%s/%s", client, crm_str(client->name), client->id);
     if(client->id != NULL) {
         g_hash_table_remove(client_list, client->id);
     }
 
     /* 0 means: yes, go ahead and destroy the connection */
     return 0;
 }
 
 static void
 st_ipc_destroy(qb_ipcs_connection_t *c) 
 {
     stonith_client_t *client = (stonith_client_t*)qb_ipcs_context_get(c);
 
     /* Make sure the connection is fully cleaned up */
     st_ipc_closed(c);
 
     if(client == NULL) {
 	crm_trace("Nothing to destroy");
 	return;
     }
 
     crm_trace("Destroying %s (%p)", client->name, client);
     
     crm_free(client->name);
     crm_free(client->id);
     crm_free(client);
     crm_trace("Done");
 
     return;
 }
 
 static void
 stonith_peer_callback(xmlNode * msg, void* private_data)
 {
     const char *remote = crm_element_value(msg, F_ORIG);
     crm_log_xml_trace(msg, "Peer[inbound]");
     stonith_command(NULL, msg, remote);
 }
 
 static void
 stonith_peer_hb_callback(HA_Message * msg, void* private_data)
 {
 #if SUPPORT_HEARTBEAT
     xmlNode *xml = convert_ha_message(NULL, msg, __FUNCTION__);
     stonith_peer_callback(xml, private_data);
     free_xml(xml);
 #endif
 }
 
 
 #if SUPPORT_COROSYNC	
 static gboolean stonith_peer_ais_callback(
     AIS_Message *wrapper, char *data, int sender) 
 {
     xmlNode *xml = NULL;
 
     if(wrapper->header.id == crm_class_cluster) {
 	xml = string2xml(data);
 	if(xml == NULL) {
 	    goto bail;
 	}
 	crm_xml_add(xml, F_ORIG, wrapper->sender.uname);
 	crm_xml_add_int(xml, F_SEQ, wrapper->id);
 	stonith_peer_callback(xml, NULL);
     }
 
     free_xml(xml);
     return TRUE;
 
   bail:
     crm_err("Invalid XML: '%.120s'", data);
     return TRUE;
 
 }
 
 static void
 stonith_peer_ais_destroy(gpointer user_data)
 {
     crm_err("AIS connection terminated");
     exit(1);
 }
 #endif
 
 static void
 stonith_peer_hb_destroy(gpointer user_data)
 {
     if(stonith_shutdown_flag) {
 	crm_info("Heartbeat disconnection complete... exiting");
     } else {
 	crm_err("Heartbeat connection lost!  Exiting.");
     }
 		
     crm_info("Exiting...");
     if (mainloop != NULL && g_main_is_running(mainloop)) {
 	g_main_quit(mainloop);
 		
     } else {
 	exit(LSB_EXIT_OK);
     }
 }
 
 void do_local_reply(xmlNode *notify_src, const char *client_id,
 		     gboolean sync_reply, gboolean from_peer)
 {
     /* send callback to originating child */
     stonith_client_t *client_obj = NULL;
     enum stonith_errors local_rc = stonith_ok;
 
     crm_trace("Sending response");
 
     if(client_id != NULL) {
 	client_obj = g_hash_table_lookup(client_list, client_id);
     } else {
 	crm_trace("No client to sent the response to."
 		    "  F_STONITH_CLIENTID not set.");
     }
 	
     crm_trace("Sending callback to request originator");
     if(client_obj == NULL) {
 	local_rc = -1;
 		
     } else {
 	crm_trace("Sending %ssync response to %s %s",
 		    sync_reply?"":"an a-",
 		    client_obj->name,
 		    from_peer?"(originator of delegated request)":"");
 		
 	local_rc = crm_ipcs_send(client_obj->channel, notify_src, !sync_reply);
     } 
 	
     if(local_rc < stonith_ok && client_obj != NULL) {
 	crm_warn("%sSync reply to %s failed: %s",
 		 sync_reply?"":"A-",
 		 client_obj?client_obj->name:"<unknown>", stonith_error2string(local_rc));
     }
 }
 
 long long get_stonith_flag(const char *name) 
 {
     if(safe_str_eq(name, STONITH_OP_FENCE)) {
 	return 0x01;
 		
     } else if(safe_str_eq(name, STONITH_OP_DEVICE_ADD)) {
 	return 0x04; 
 
     } else if(safe_str_eq(name, STONITH_OP_DEVICE_DEL)) {
 	return 0x10;
    }
     return 0;
 }
 
 static void
 stonith_notify_client(gpointer key, gpointer value, gpointer user_data)
 {
 
     xmlNode *update_msg = user_data;
     stonith_client_t *client = value;
     const char *type = NULL;
 
     CRM_CHECK(client != NULL, return);
     CRM_CHECK(update_msg != NULL, return);
 
     type = crm_element_value(update_msg, F_SUBTYPE);
     CRM_CHECK(type != NULL, crm_log_xml_err(update_msg, "notify"); return);
 
     if(client == NULL) {
 	crm_trace("Skipping NULL client");
 	return;
 
     } else if(client->channel == NULL) {
 	crm_trace("Skipping client with NULL channel");
 	return;
 
     } else if(client->name == NULL) {
 	crm_trace("Skipping unnammed client / comamnd channel");
 	return;
     }
 
     if(client->flags & get_stonith_flag(type)) {
 	crm_trace("Sending %s-notification to client %s/%s", type, client->name, client->id);
         if(crm_ipcs_send(client->channel, update_msg, ipcs_send_event|ipcs_send_error) <= 0) {
 	    crm_warn("%s-Notification of client %s/%s failed",
 		     type, client->name, client->id);
 	}
     }
 }
 
 void
 do_stonith_notify(
     int options, const char *type, enum stonith_errors result, xmlNode *data,
     const char *remote) 
 {
     /* TODO: Standardize the contents of data */
     xmlNode *update_msg = create_xml_node(NULL, "notify");
 
     CRM_CHECK(type != NULL, ;);
     
     crm_xml_add(update_msg, F_TYPE, T_STONITH_NOTIFY);
     crm_xml_add(update_msg, F_SUBTYPE, type);
     crm_xml_add(update_msg, F_STONITH_OPERATION, type);
     crm_xml_add_int(update_msg, F_STONITH_RC, result);
 	
     if(data != NULL) {
 	add_message_xml(update_msg, F_STONITH_CALLDATA, data);
     }
 
     crm_trace("Notifying clients");
     g_hash_table_foreach(client_list, stonith_notify_client, update_msg);
     free_xml(update_msg);
     crm_trace("Notify complete");
 }
 
 static stonith_key_value_t *parse_device_list(const char *devices) 
 {
     int lpc = 0;
     int max = 0;
     int last = 0;
     stonith_key_value_t *output = NULL;
 
     if(devices == NULL) {
 	return output;
     }
 
     max = strlen(devices);
     for(lpc = 0; lpc <= max; lpc++) {
         if(devices[lpc] == ',' || devices[lpc] == 0) {
 	    char *line = NULL;
 
             crm_malloc0(line, 2 + lpc - last);
             snprintf(line, 1 + lpc - last, "%s", devices+last);
             output = stonith_key_value_add(output, NULL, line);
             crm_free(line);
 
             last = lpc + 1;
         }
     }
 
     return output;
 }
 
 static void topology_remove_helper(const char *node, int level) 
 {
     xmlNode *data = create_xml_node(NULL, F_STONITH_LEVEL);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add_int(data, XML_ATTR_ID, level);
     crm_xml_add(data, F_STONITH_TARGET, node);
     stonith_level_remove(data);
     free_xml(data);
 }
 
 static void topology_register_helper(const char *node, int level, stonith_key_value_t *device_list) 
 {
     xmlNode *data = create_level_registration_xml(node, level, device_list);
 
     stonith_level_register(data);
     free_xml(data);
 }
 
 static void remove_fencing_topology(xmlXPathObjectPtr xpathObj)
 {
     int max = 0, lpc = 0;
 
     if(xpathObj && xpathObj->nodesetval) {
         max = xpathObj->nodesetval->nodeNr;
     }
 
     for(lpc = 0; lpc < max; lpc++) {
         xmlNode *match = getXpathResult(xpathObj, lpc);
         CRM_CHECK(match != NULL, continue);
 
         if(crm_element_value(match, XML_DIFF_MARKER)) {
             /* Deletion */
             int index = 0;
             const char *target = crm_element_value(match, XML_ATTR_STONITH_TARGET);
 
             crm_element_value_int(match, XML_ATTR_STONITH_INDEX, &index);
             if(target == NULL) {
                 crm_err("Invalid fencing target in element %s", ID(match));
 
             } else if(index <= 0) {
                 crm_err("Invalid level for %s in element %s", target, ID(match));
 
             } else {
                 topology_remove_helper(target, index);
             }
      /* } else { Deal with modifications during the 'addition' stage */
         }
     }
 }
 
 
 static void register_fencing_topology(xmlXPathObjectPtr xpathObj, gboolean force)
 {
     int max = 0, lpc = 0;
 
     if(xpathObj && xpathObj->nodesetval) {
         max = xpathObj->nodesetval->nodeNr;
     }
 
     for(lpc = 0; lpc < max; lpc++) {
         int index = 0;
         const char *target;
         const char *dev_list;
         stonith_key_value_t *devices = NULL;
         xmlNode *match = getXpathResult(xpathObj, lpc);
         CRM_CHECK(match != NULL, continue);
 
         crm_element_value_int(match, XML_ATTR_STONITH_INDEX, &index);
         target = crm_element_value(match, XML_ATTR_STONITH_TARGET);
         dev_list = crm_element_value(match, XML_ATTR_STONITH_DEVICES);
         devices = parse_device_list(dev_list);
 
         crm_trace("Updating %s[%d] (%s) to %s", target, index, ID(match), dev_list);
 
         if(target == NULL) {
             crm_err("Invalid fencing target in element %s", ID(match));
 
         } else if(index <= 0) {
             crm_err("Invalid level for %s in element %s", target, ID(match));
 
         } else if(force == FALSE && crm_element_value(match, XML_DIFF_MARKER)) {
             /* Addition */
             topology_register_helper(target, index, devices);
 
         } else { /* Modification */
             /* Remove then re-add */
             topology_remove_helper(target, index);
             topology_register_helper(target, index, devices);
         }
 
         stonith_key_value_freeall(devices, 1, 1);
     }
 }
 
 /* Fencing 
 <diff crm_feature_set="3.0.6">
   <diff-removed>
     <fencing-topology>
       <fencing-level id="f-p1.1" target="pcmk-1" index="1" devices="poison-pill" __crm_diff_marker__="removed:top"/>
       <fencing-level id="f-p1.2" target="pcmk-1" index="2" devices="power" __crm_diff_marker__="removed:top"/>
       <fencing-level devices="disk,network" id="f-p2.1"/>
     </fencing-topology>
   </diff-removed>
   <diff-added>
     <fencing-topology>
       <fencing-level id="f-p.1" target="pcmk-1" index="1" devices="poison-pill" __crm_diff_marker__="added:top"/>
       <fencing-level id="f-p2.1" target="pcmk-2" index="1" devices="disk,something"/>
       <fencing-level id="f-p3.1" target="pcmk-2" index="2" devices="power" __crm_diff_marker__="added:top"/>
     </fencing-topology>
   </diff-added>
 </diff>
 */
 
 static void
 fencing_topology_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void *user_data)
 {
     xmlXPathObjectPtr xpathObj = NULL;
     const char *xpath = "//" XML_TAG_FENCING_LEVEL;
 
     crm_trace("Pushing in stonith topology");
 
     /* Grab everything */
     xpathObj = xpath_search(msg, xpath);
 
     register_fencing_topology(xpathObj, TRUE);
 
     if(xpathObj) {
 	xmlXPathFreeObject(xpathObj);
     }
 }
 
 static void
 update_fencing_topology(const char *event, xmlNode * msg)
 {
     const char *xpath;
     xmlXPathObjectPtr xpathObj = NULL;
 
     /* Process deletions (only) */
     xpath = "//" F_CIB_UPDATE_RESULT "//" XML_TAG_DIFF_REMOVED "//" XML_TAG_FENCING_LEVEL;
     xpathObj = xpath_search(msg, xpath);
 
     remove_fencing_topology(xpathObj);
 
     if(xpathObj) {
 	xmlXPathFreeObject(xpathObj);
     }
 
     /* Process additions and changes */
     xpath = "//" F_CIB_UPDATE_RESULT "//" XML_TAG_DIFF_ADDED "//" XML_TAG_FENCING_LEVEL;
     xpathObj = xpath_search(msg, xpath);
 
     register_fencing_topology(xpathObj, FALSE);
 
     if(xpathObj) {
 	xmlXPathFreeObject(xpathObj);
     }
 }
 
 static void
 stonith_shutdown(int nsig)
 {
     stonith_shutdown_flag = TRUE;
     crm_info("Terminating with  %d clients", g_hash_table_size(client_list));
     exit(0);
 }
 
 static void
 stonith_cleanup(void) 
 {
     crm_peer_destroy();	
     g_hash_table_destroy(client_list);
     crm_free(stonith_our_uname);
 #if HAVE_LIBXML2
     crm_xml_cleanup();
 #endif
     crm_free(channel1);
 }
 
 /* *INDENT-OFF* */
 static struct crm_option long_options[] = {
     {"stand-alone", 0, 0, 's'},
     {"verbose",     0, 0, 'V'},
     {"version",     0, 0, '$'},
     {"help",        0, 0, '?'},
     
     {0, 0, 0, 0}
 };
 /* *INDENT-ON* */
 
 static void
 setup_cib(void)
 {
     static void *cib_library = NULL;
     static cib_t *(*cib_new_fn)(void) = NULL;
     static const char *(*cib_err_fn)(enum cib_errors) = NULL;
 
     int rc, retries = 0;
     cib_t *cib = NULL;
 
     if(cib_library == NULL) {
         cib_library = dlopen(CIB_LIBRARY, RTLD_LAZY);
     }
     if(cib_library && cib_new_fn == NULL) {
         cib_new_fn = dlsym(cib_library, "cib_new");
     }
     if(cib_library && cib_err_fn == NULL) {
         cib_err_fn = dlsym(cib_library, "cib_error2string");
     }
     if(cib_new_fn != NULL) {
         cib = (*cib_new_fn)();
     }
     
     if(cib == NULL) {
         crm_err("No connection to the CIB");
         return;
     }
 
     do {
         sleep(retries);
         rc = cib->cmds->signon(cib, CRM_SYSTEM_CRMD, cib_command);
     } while(rc == cib_connection && ++retries < 5);
     
     if (rc != cib_ok) {
         crm_err("Could not connect to the CIB service: %s", (*cib_err_fn)(rc));
         
     } else if (cib_ok != cib->cmds->add_notify_callback(
                    cib, T_CIB_DIFF_NOTIFY, update_fencing_topology)) {
         crm_err("Could not set CIB notification callback");
         
     } else {
         rc = cib->cmds->query(cib, NULL, NULL, cib_scope_local);
         add_cib_op_callback(cib, rc, FALSE, NULL, fencing_topology_callback);
         crm_notice("Watching for stonith topology changes");
     }    
 }
 
 struct qb_ipcs_service_handlers ipc_callbacks = 
 {
     .connection_accept = st_ipc_accept,
     .connection_created = st_ipc_created,
     .msg_process = st_ipc_dispatch,
     .connection_closed = st_ipc_closed,
     .connection_destroyed = st_ipc_destroy
 };
 
 int
 main(int argc, char ** argv)
 {
     int flag;
     int rc = 0;
     int lpc = 0;
     int argerr = 0;
     int option_index = 0;
     qb_ipcs_service_t *ipcs = NULL;
     const char *actions[] = { "reboot", "poweroff", "list", "monitor", "status" };
 
     crm_log_init("stonith-ng", LOG_INFO, TRUE, FALSE, argc, argv);
     crm_set_options(NULL, "mode [options]", long_options,
 		    "Provides a summary of cluster's current state."
 		    "\n\nOutputs varying levels of detail in a number of different formats.\n");
 
     while (1) {
 	flag = crm_get_option(argc, argv, &option_index);
 	if (flag == -1)
 	    break;
 		
 	switch(flag) {
 	    case 'V':
 		crm_bump_log_level();
 		break;
 	    case 's':
 		stand_alone = TRUE;
 		break;
 	    case '$':
 	    case '?':
 		crm_help(flag, LSB_EXIT_OK);
 		break;
 	    default:
 		++argerr;
 		break;
 	}
     }
 
     if(argc - optind == 1 && safe_str_eq("metadata", argv[optind])) {
 	printf("<?xml version=\"1.0\"?><!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n");
 	printf("<resource-agent name=\"stonithd\">\n");
 	printf(" <version>1.0</version>\n");
 	printf(" <longdesc lang=\"en\">This is a fake resource that details the instance attributes handled by stonithd.</longdesc>\n");
 	printf(" <shortdesc lang=\"en\">Options available for all stonith resources</shortdesc>\n");
 	printf(" <parameters>\n");
 
 	printf("  <parameter name=\"stonith-timeout\" unique=\"0\">\n");
 	printf("    <shortdesc lang=\"en\">How long to wait for the STONITH action to complete.</shortdesc>\n");
 	printf("    <longdesc lang=\"en\">Overrides the stonith-timeout cluster property</longdesc>\n");
 	printf("    <content type=\"time\" default=\"60s\"/>\n");
 	printf("  </parameter>\n");
 
 	printf("  <parameter name=\"priority\" unique=\"0\">\n");
 	printf("    <shortdesc lang=\"en\">The priority of the stonith resource. The lower the number, the higher the priority.</shortdesc>\n");
 	printf("    <content type=\"integer\" default=\"0\"/>\n");
 	printf("  </parameter>\n");
 
 	printf("  <parameter name=\"%s\" unique=\"0\">\n", STONITH_ATTR_HOSTARG);
 	printf("    <shortdesc lang=\"en\">Advanced use only: An alternate parameter to supply instead of 'port'</shortdesc>\n");
 	printf("    <longdesc lang=\"en\">Some devices do not support the standard 'port' parameter or may provide additional ones.\n"
 	       "Use this to specify an alternate, device-specific, parameter that should indicate the machine to be fenced.\n"
 	       "A value of 'none' can be used to tell the cluster not to supply any additional parameters.\n"
 	       "     </longdesc>\n");
 	printf("    <content type=\"string\" default=\"port\"/>\n");
 	printf("  </parameter>\n");
 
 	printf("  <parameter name=\"%s\" unique=\"0\">\n", STONITH_ATTR_HOSTMAP);
 	printf("    <shortdesc lang=\"en\">A mapping of host names to ports numbers for devices that do not support host names.</shortdesc>\n");
 	printf("    <longdesc lang=\"en\">Eg. node1:1;node2:2,3 would tell the cluster to use port 1 for node1 and ports 2 and 3 for node2</longdesc>\n");
 	printf("    <content type=\"string\" default=\"\"/>\n");
 	printf("  </parameter>\n");
 
 	printf("  <parameter name=\"%s\" unique=\"0\">\n", STONITH_ATTR_HOSTLIST);
 	printf("    <shortdesc lang=\"en\">A list of machines controlled by this device (Optional unless %s=static-list).</shortdesc>\n", STONITH_ATTR_HOSTCHECK);
 	printf("    <content type=\"string\" default=\"\"/>\n");
 	printf("  </parameter>\n");
 
 	printf("  <parameter name=\"%s\" unique=\"0\">\n", STONITH_ATTR_HOSTCHECK);
 	printf("    <shortdesc lang=\"en\">How to determin which machines are controlled by the device.</shortdesc>\n");
 	printf("    <longdesc lang=\"en\">Allowed values: dynamic-list (query the device), static-list (check the %s attribute), none (assume every device can fence every machine)</longdesc>\n", STONITH_ATTR_HOSTLIST);
 	printf("    <content type=\"string\" default=\"dynamic-list\"/>\n");
 	printf("  </parameter>\n");
 
 	for(lpc = 0; lpc < DIMOF(actions); lpc++) {
 	    printf("  <parameter name=\"pcmk_%s_action\" unique=\"0\">\n", actions[lpc]);
 	    printf("    <shortdesc lang=\"en\">Advanced use only: An alternate command to run instead of '%s'</shortdesc>\n", actions[lpc]);
 	    printf("    <longdesc lang=\"en\">Some devices do not support the standard commands or may provide additional ones.\n"
 		   "Use this to specify an alternate, device-specific, command that implements the '%s' action.</longdesc>\n", actions[lpc]);
 	    printf("    <content type=\"string\" default=\"%s\"/>\n", actions[lpc]);
 	    printf("  </parameter>\n");
 	}
 	
 	printf(" </parameters>\n");
 	printf("</resource-agent>\n");
 	return 0;
     }
 
     if (optind != argc) {
 	++argerr;
     }
     
     if (argerr) {
 	crm_help('?', LSB_EXIT_GENERIC);
     }
 
     mainloop_add_signal(SIGTERM, stonith_shutdown);
-	
-    /* EnableProcLogging(); */
-    set_sigchld_proctrack(G_PRIORITY_HIGH,DEFAULT_MAXDISPATCHTIME);
 
     crm_peer_init();
     client_list = g_hash_table_new(crm_str_hash, g_str_equal);
 	
     if(stand_alone == FALSE) {
 	void *dispatch = stonith_peer_hb_callback;
 	void *destroy = stonith_peer_hb_destroy;
 
 	if(is_openais_cluster()) {
 #if SUPPORT_COROSYNC
 	    destroy = stonith_peer_ais_destroy;
 	    dispatch = stonith_peer_ais_callback;
 #endif
 	}
 	    
 	if(crm_cluster_connect(&stonith_our_uname, NULL, dispatch, destroy,
 #if SUPPORT_HEARTBEAT
 			       &hb_conn
 #else
 			       NULL
 #endif
 	       ) == FALSE){
 	    crm_crit("Cannot sign in to the cluster... terminating");
 	    exit(100);
 	}
 
         setup_cib();
 
     } else {
 	stonith_our_uname = crm_strdup("localhost");
     }
 
     device_list = g_hash_table_new_full(
         crm_str_hash, g_str_equal, NULL, free_device);
 
     topology = g_hash_table_new_full(
         crm_str_hash, g_str_equal, NULL, free_topology_entry);
 
     ipcs = mainloop_add_ipc_server("stonith-ng", QB_IPC_NATIVE, &ipc_callbacks);
 
 #if SUPPORT_STONITH_CONFIG
     if (((stand_alone == TRUE)) && !(standalone_cfg_read_file(STONITH_NG_CONF_FILE))) {
         standalone_cfg_commit();
     }
 #endif
 
     if(ipcs != NULL) {
 	/* Create the mainloop and run it... */
 	mainloop = g_main_new(FALSE);
 	crm_info("Starting %s mainloop", crm_system_name);
 
 	g_main_run(mainloop);
 
     } else {
 	crm_err("Couldnt start all communication channels, exiting.");
     }
 	
     stonith_cleanup();
 
 #if SUPPORT_HEARTBEAT
     if(hb_conn) {
 	hb_conn->llc_ops->delete(hb_conn);
     }
 #endif
 	
     crm_info("Done");
 
     return rc;
 }
 
diff --git a/include/crm/stonith-ng-internal.h b/include/crm/stonith-ng-internal.h
index f88139c532..be66d45d64 100644
--- a/include/crm/stonith-ng-internal.h
+++ b/include/crm/stonith-ng-internal.h
@@ -1,61 +1,62 @@
 /* 
  * Copyright (C) 2011 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
  */
 #ifndef STONITH_NG_INTERNAL__H
 #  define STONITH_NG_INTERNAL__H
 
 #  include <crm/common/ipc.h>
 #  include <crm/common/xml.h>
 #  include <clplumbing/proctrack.h>
 
 typedef struct async_command_s {
 
     int id;
     int stdout;
     int options;
     int timeout;
 
     char *op;
     char *origin;
     char *client;
     char *remote;
 
     char *victim;
     char *action;
     char *device;
 
     GListPtr device_list;
     GListPtr device_next;
 
-    ProcTrack_ops *pt_ops;
-    ProcTrackKillInfo killseq[3];
+    void (*done)(GPid pid, gint status, gpointer user_data);
+    guint timer_sigterm;
+    guint timer_sigkill;
 
 } async_command_t;
 
 extern int run_stonith_agent(const char *agent, const char *action, const char *victim,
                              GHashTable * dev_hash, GHashTable * port_map, int *agent_result,
                              char **output, async_command_t * track);
 
 extern gboolean is_redhat_agent(const char *agent);
 
 xmlNode *create_level_registration_xml(const char *node, int level,
                                        stonith_key_value_t * device_list);
 
 xmlNode *create_device_registration_xml(const char *id, const char *namespace, const char *agent,
                                         stonith_key_value_t * params);
 
 #endif
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
index a32b6145ce..a69b38efcb 100644
--- a/lib/fencing/st_client.c
+++ b/lib/fencing/st_client.c
@@ -1,1919 +1,1939 @@
 /*
  * Copyright (c) 2004 Andrew Beekhof <andrew@beekhof.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This library 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
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser 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 <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <glib.h>
 #include <dirent.h>
 #include <libgen.h>             /* Add it for compiling on OSX */
 
 #include <crm/crm.h>
 #include <crm/stonith-ng.h>
 #include <crm/stonith-ng-internal.h>
 #include <crm/msg_xml.h>
 #include <crm/common/xml.h>
 #include <stonith/stonith.h>
 
 #include <crm/common/mainloop.h>
 
 
 CRM_TRACE_INIT_DATA(stonith);
 
 typedef struct stonith_private_s {
     char *token;
     crm_ipc_t *ipc;
     mainloop_io_t *source;
     GHashTable *stonith_op_callback_table;
     GList *notify_list;
 
     void (*op_callback) (stonith_t * st, const xmlNode * msg, int call, int rc, xmlNode * output,
                          void *userdata);
 
 } stonith_private_t;
 
 typedef struct stonith_notify_client_s {
     const char *event;
     const char *obj_id;         /* implement one day */
     const char *obj_type;       /* implement one day */
     void (*notify) (stonith_t * st, const char *event, xmlNode * msg);
 
 } stonith_notify_client_t;
 
 typedef struct stonith_callback_client_s {
     void (*callback) (stonith_t * st, const xmlNode * msg, int call, int rc, xmlNode * output,
                       void *userdata);
     const char *id;
     void *user_data;
     gboolean only_success;
     struct timer_rec_s *timer;
 
 } stonith_callback_client_t;
 
 struct notify_blob_s {
     stonith_t *stonith;
     xmlNode *xml;
 };
 
 struct timer_rec_s {
     int call_id;
     int timeout;
     guint ref;
     stonith_t *stonith;
 };
 
 typedef enum stonith_errors (*stonith_op_t) (const char *, int, const char *, xmlNode *,
                                              xmlNode *, xmlNode *, xmlNode **, xmlNode **);
 
 static const char META_TEMPLATE[] =
     "<?xml version=\"1.0\"?>\n"
     "<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"
     "<resource-agent name=\"%s\">\n"
     "  <version>1.0</version>\n"
     "  <longdesc lang=\"en\">\n"
     "%s\n"
     "  </longdesc>\n"
     "  <shortdesc lang=\"en\">%s</shortdesc>\n"
     "%s\n"
     "  <actions>\n"
     "    <action name=\"start\"   timeout=\"20\" />\n"
     "    <action name=\"stop\"    timeout=\"15\" />\n"
     "    <action name=\"status\"  timeout=\"20\" />\n"
     "    <action name=\"monitor\" timeout=\"20\" interval=\"3600\"/>\n"
     "    <action name=\"meta-data\"  timeout=\"15\" />\n"
     "  </actions>\n"
     "  <special tag=\"heartbeat\">\n"
     "    <version>2.0</version>\n" "  </special>\n" "</resource-agent>\n";
 
 bool stonith_dispatch(stonith_t * st);
 int stonith_dispatch_internal(const char *buffer, ssize_t length, gpointer userdata);
 void stonith_perform_callback(stonith_t * stonith, xmlNode * msg, int call_id, int rc);
 xmlNode *stonith_create_op(int call_id, const char *token, const char *op, xmlNode * data,
                            int call_options);
 int stonith_send_command(stonith_t * stonith, const char *op, xmlNode * data,
                          xmlNode ** output_data, int call_options, int timeout);
 
 static void stonith_connection_destroy(gpointer user_data);
 static void stonith_send_notification(gpointer data, gpointer user_data);
 
 static void
 stonith_connection_destroy(gpointer user_data)
 {
     stonith_t *stonith = user_data;
     stonith_private_t *native = NULL;
     struct notify_blob_s blob;
 
     crm_trace("Sending destroyed notification");
     blob.stonith = stonith;
     blob.xml = create_xml_node(NULL, "notify");
 
     native = stonith->private;
 
     stonith->state = stonith_disconnected;
     crm_xml_add(blob.xml, F_TYPE, T_STONITH_NOTIFY);
     crm_xml_add(blob.xml, F_SUBTYPE, T_STONITH_NOTIFY_DISCONNECT);
 
     g_list_foreach(native->notify_list, stonith_send_notification, &blob);
     free_xml(blob.xml);
 }
 
 xmlNode *
 create_device_registration_xml(const char *id, const char *namespace, const char *agent,
                                stonith_key_value_t * params)
 {
     xmlNode *data = create_xml_node(NULL, F_STONITH_DEVICE);
     xmlNode *args = create_xml_node(data, XML_TAG_ATTRS);
 
     crm_xml_add(data, XML_ATTR_ID, id);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add(data, "agent", agent);
     crm_xml_add(data, "namespace", namespace);
 
     for (; params; params = params->next) {
         hash2field((gpointer) params->key, (gpointer) params->value, args);
     }
 
     return data;
 }
 
 static int
 stonith_api_register_device(stonith_t * st, int call_options,
                             const char *id, const char *namespace, const char *agent,
                             stonith_key_value_t * params)
 {
     int rc = 0;
     xmlNode *data = create_device_registration_xml(id, namespace, agent, params);
 
     rc = stonith_send_command(st, STONITH_OP_DEVICE_ADD, data, NULL, call_options, 0);
     free_xml(data);
 
     return rc;
 }
 
 static int
 stonith_api_remove_device(stonith_t * st, int call_options, const char *name)
 {
     int rc = 0;
     xmlNode *data = NULL;
 
     data = create_xml_node(NULL, F_STONITH_DEVICE);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add(data, XML_ATTR_ID, name);
     rc = stonith_send_command(st, STONITH_OP_DEVICE_DEL, data, NULL, call_options, 0);
     free_xml(data);
 
     return rc;
 }
 
 static int
 stonith_api_remove_level(stonith_t * st, int options, const char *node, int level)
 {
     int rc = 0;
     xmlNode *data = NULL;
 
     data = create_xml_node(NULL, F_STONITH_LEVEL);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add(data, F_STONITH_TARGET, node);
     crm_xml_add_int(data, XML_ATTR_ID, level);
     rc = stonith_send_command(st, STONITH_OP_LEVEL_DEL, data, NULL, options, 0);
     free_xml(data);
 
     return rc;
 }
 
 xmlNode *
 create_level_registration_xml(const char *node, int level, stonith_key_value_t * device_list)
 {
     xmlNode *data = create_xml_node(NULL, F_STONITH_LEVEL);
 
     crm_xml_add_int(data, XML_ATTR_ID, level);
     crm_xml_add(data, F_STONITH_TARGET, node);
     crm_xml_add(data, "origin", __FUNCTION__);
 
     for (; device_list; device_list = device_list->next) {
         xmlNode *dev = create_xml_node(data, F_STONITH_DEVICE);
 
         crm_xml_add(dev, XML_ATTR_ID, device_list->value);
     }
 
     return data;
 }
 
 static int
 stonith_api_register_level(stonith_t * st, int options, const char *node, int level,
                            stonith_key_value_t * device_list)
 {
     int rc = 0;
     xmlNode *data = create_level_registration_xml(node, level, device_list);
 
     rc = stonith_send_command(st, STONITH_OP_LEVEL_ADD, data, NULL, options, 0);
     free_xml(data);
 
     return rc;
 }
 
 static void
 append_arg(gpointer key, gpointer value, gpointer user_data)
 {
     int len = 3;                /* =, \n, \0 */
     int last = 0;
     char **args = user_data;
 
     CRM_CHECK(key != NULL, return);
     CRM_CHECK(value != NULL, return);
 
     if (strstr(key, "pcmk_")) {
         return;
     } else if (strstr(key, CRM_META)) {
         return;
     } else if (safe_str_eq(key, "crm_feature_set")) {
         return;
     }
 
     len += strlen(key);
     len += strlen(value);
     if (*args != NULL) {
         last = strlen(*args);
     }
 
     crm_realloc(*args, last + len);
     crm_trace("Appending: %s=%s", (char *)key, (char *)value);
     sprintf((*args) + last, "%s=%s\n", (char *)key, (char *)value);
 }
 
 static void
 append_const_arg(const char *key, const char *value, char **arg_list)
 {
     char *glib_sucks_key = crm_strdup(key);
     char *glib_sucks_value = crm_strdup(value);
 
     append_arg(glib_sucks_key, glib_sucks_value, arg_list);
 
     crm_free(glib_sucks_value);
     crm_free(glib_sucks_key);
 }
 
 static void
 append_host_specific_args(const char *victim, const char *map, GHashTable * params, char **arg_list)
 {
     char *name = NULL;
     int last = 0, lpc = 0, max = 0;
 
     if (map == NULL) {
         /* The best default there is for now... */
         crm_debug("Using default arg map: port=uname");
         append_const_arg("port", victim, arg_list);
         return;
     }
 
     max = strlen(map);
     crm_debug("Processing arg map: %s", map);
     for (; lpc < max + 1; lpc++) {
         if (isalpha(map[lpc])) {
             /* keep going */
 
         } else if (map[lpc] == '=' || map[lpc] == ':') {
             crm_free(name);
             crm_malloc0(name, 1 + lpc - last);
             strncpy(name, map + last, lpc - last);
             crm_debug("Got name: %s", name);
             last = lpc + 1;
 
         } else if (map[lpc] == 0 || map[lpc] == ',' || isspace(map[lpc])) {
             char *param = NULL;
             const char *value = NULL;
 
             crm_malloc0(param, 1 + lpc - last);
             strncpy(param, map + last, lpc - last);
             last = lpc + 1;
 
             crm_debug("Got key: %s", param);
             if (name == NULL) {
                 crm_err("Misparsed '%s', found '%s' without a name", map, param);
                 crm_free(param);
                 continue;
             }
 
             if (safe_str_eq(param, "uname")) {
                 value = victim;
             } else {
                 char *key = crm_meta_name(param);
 
                 value = g_hash_table_lookup(params, key);
                 crm_free(key);
             }
 
             if (value) {
                 crm_debug("Setting '%s'='%s' (%s) for %s", name, value, param, victim);
                 append_const_arg(name, value, arg_list);
 
             } else {
                 crm_err("No node attribute '%s' for '%s'", name, victim);
             }
 
             crm_free(name);
             name = NULL;
             crm_free(param);
             if (map[lpc] == 0) {
                 break;
             }
 
         } else if (isspace(map[lpc])) {
             last = lpc;
         }
     }
     crm_free(name);
 }
 
 static char *
 make_args(const char *action, const char *victim, GHashTable * device_args, GHashTable * port_map)
 {
     char buffer[512];
     char *arg_list = NULL;
     const char *value = NULL;
 
     CRM_CHECK(action != NULL, return NULL);
 
     if (device_args) {
         g_hash_table_foreach(device_args, append_arg, &arg_list);
     }
 
     buffer[511] = 0;
     snprintf(buffer, 511, "pcmk_%s_action", action);
     if (device_args) {
         value = g_hash_table_lookup(device_args, buffer);
     }
 
     if (value == NULL && device_args) {
         /* Legacy support for early 1.1 releases - Remove for 1.2 */
         snprintf(buffer, 511, "pcmk_%s_cmd", action);
         value = g_hash_table_lookup(device_args, buffer);
     }
 
     if (value) {
         crm_info("Substituting action '%s' for requested operation '%s'", value, action);
         action = value;
     }
 
     append_const_arg(STONITH_ATTR_ACTION_OP, action, &arg_list);
     if (victim && device_args) {
         const char *alias = victim;
         const char *param = g_hash_table_lookup(device_args, STONITH_ATTR_HOSTARG);
 
         if (port_map && g_hash_table_lookup(port_map, victim)) {
             alias = g_hash_table_lookup(port_map, victim);
         }
 
         /* Always supply the node's name too:
          *    https://fedorahosted.org/cluster/wiki/FenceAgentAPI
          */
         append_const_arg("nodename", victim, &arg_list);
 
         /* Check if we need to supply the victim in any other form */
         if (param == NULL) {
             const char *map = g_hash_table_lookup(device_args, STONITH_ATTR_ARGMAP);
 
             if (map == NULL) {
                 param = "port";
                 value = g_hash_table_lookup(device_args, param);
 
             } else {
                 /* Legacy handling */
                 append_host_specific_args(alias, map, device_args, &arg_list);
                 value = map;    /* Nothing more to do */
             }
 
         } else if (safe_str_eq(param, "none")) {
             value = param;      /* Nothing more to do */
 
         } else {
             value = g_hash_table_lookup(device_args, param);
         }
 
         /* Don't overwrite explictly set values for $param */
         if (value == NULL || safe_str_eq(value, "dynamic")) {
             crm_debug("Performing %s action for node '%s' as '%s=%s'", action, victim, param,
                       alias);
             append_const_arg(param, alias, &arg_list);
         }
     }
 
     crm_trace("Calculated: %s", arg_list);
     return arg_list;
 }
 
+static gboolean
+st_child_term(gpointer data)
+{
+    int rc = 0;
+    int pid = GPOINTER_TO_INT(data);
+    crm_info("Child %d timed out, sending SIGTERM", pid);
+    rc = kill(pid, SIGTERM);
+    if(rc < 0) {
+        crm_perror(LOG_ERR, "Couldn't send SIGTERM to %d", pid);
+    }
+    return FALSE;
+}
+
+static gboolean
+st_child_kill(gpointer data)
+{
+    int rc = 0;
+    int pid = GPOINTER_TO_INT(data);
+    crm_info("Child %d timed out, sending SIGKILL", pid);
+    rc = kill(pid, SIGKILL);
+    if(rc < 0) {
+        crm_perror(LOG_ERR, "Couldn't send SIGKILL to %d", pid);
+    }
+    return FALSE;
+}
+
 /* Borrowed from libfence and extended */
 int
 run_stonith_agent(const char *agent, const char *action, const char *victim,
                   GHashTable * device_args, GHashTable * port_map, int *agent_result, char **output,
                   async_command_t * track)
 {
     char *args = make_args(action, victim, device_args, port_map);
     int pid, status, len, rc = st_err_internal;
     int p_read_fd, p_write_fd;  /* parent read/write file descriptors */
     int c_read_fd, c_write_fd;  /* child read/write file descriptors */
     int fd1[2];
     int fd2[2];
 
     c_read_fd = c_write_fd = p_read_fd = p_write_fd = -1;
 
     if (args == NULL || agent == NULL)
         goto fail;
     len = strlen(args);
 
     if (pipe(fd1))
         goto fail;
     p_read_fd = fd1[0];
     c_write_fd = fd1[1];
 
     if (pipe(fd2))
         goto fail;
     c_read_fd = fd2[0];
     p_write_fd = fd2[1];
 
     crm_debug("forking");
     pid = fork();
     if (pid < 0) {
         rc = st_err_agent_fork;
         goto fail;
     }
 
     if (pid) {
         /* parent */
         int ret;
         int total = 0;
 
         fcntl(p_read_fd, F_SETFL, fcntl(p_read_fd, F_GETFL, 0) | O_NONBLOCK);
 
         do {
             crm_debug("sending args");
             ret = write(p_write_fd, args + total, len - total);
             if (ret > 0) {
                 total += ret;
             }
 
         } while (errno == EINTR && total < len);
 
         if (total != len) {
             crm_perror(LOG_ERR, "Sent %d not %d bytes", total, len);
             if (ret >= 0) {
                 rc = st_err_agent_args;
             }
             goto fail;
         }
 
         close(p_write_fd);
 
-        if (track) {
+        if (track && track->done) {
             track->stdout = p_read_fd;
-            NewTrackedProc(pid, 0, PT_LOGNORMAL, track, track->pt_ops);
+            g_child_watch_add(pid, track->done, track);
             crm_trace("Op: %s on %s, pid: %d, timeout: %d", action, agent, pid, track->timeout);
 
             if (track->timeout) {
-                track->killseq[0].mstimeout = track->timeout;   /* after timeout send TERM */
-                track->killseq[0].signalno = SIGTERM;
-                track->killseq[1].mstimeout = 5000;     /* after another 5s remove it */
-                track->killseq[1].signalno = SIGKILL;
-                track->killseq[2].mstimeout = 5000;     /* if it's still there after another 5s, complain */
-                track->killseq[2].signalno = 0;
-
-                SetTrackedProcTimeouts(pid, track->killseq);
+                track->timer_sigterm = g_timeout_add(track->timeout, st_child_term, GINT_TO_POINTER(pid));
+                track->timer_sigkill = g_timeout_add(track->timeout+5000, st_child_kill, GINT_TO_POINTER(pid));
 
             } else {
                 crm_err("No timeout set for stonith operation %s with device %s", action, agent);
             }
 
             close(c_write_fd);
             close(c_read_fd);
             crm_free(args);
             return pid;
 
         } else {
             pid_t p;
 
             do {
                 p = waitpid(pid, &status, 0);
             } while (p < 0 && errno == EINTR);
 
             if (p < 0) {
                 crm_perror(LOG_ERR, "waitpid(%d)", pid);
 
             } else if (p != pid) {
                 crm_err("Waited for %d, got %d", pid, p);
             }
 
             if (output != NULL) {
                 len = 0;
                 do {
                     char buf[500];
 
                     ret = read(p_read_fd, buf, 500);
                     if (ret > 0) {
                         buf[ret] = 0;
                         crm_realloc(*output, len + ret + 1);
                         sprintf((*output) + len, "%s", buf);
                         crm_debug("%d: %s", ret, (*output) + len);
                         len += ret;
                     }
 
                 } while (ret == 500 || (ret < 0 && errno == EINTR));
             }
 
             rc = st_err_agent;
             *agent_result = st_err_agent;
             if (WIFEXITED(status)) {
                 crm_debug("result = %d", WEXITSTATUS(status));
                 *agent_result = -WEXITSTATUS(status);
                 rc = 0;
 
             } else if (WIFSIGNALED(status)) {
                 crm_err("call %s for %s exited due to signal %d", action, agent, WTERMSIG(status));
 
             } else {
                 crm_err("call %s for %s exited abnormally. stopped=%d, continued=%d",
                         action, agent, WIFSTOPPED(status), WIFCONTINUED(status));
             }
         }
 
     } else {
         /* child */
 
         close(1);
         /* coverity[leaked_handle] False positive */
         if (dup(c_write_fd) < 0)
             goto fail;
         close(2);
         /* coverity[leaked_handle] False positive */
         if (dup(c_write_fd) < 0)
             goto fail;
         close(0);
         /* coverity[leaked_handle] False positive */
         if (dup(c_read_fd) < 0)
             goto fail;
 
         /* keep c_write_fd open so parent can report all errors. */
         close(c_read_fd);
         close(p_read_fd);
         close(p_write_fd);
 
         execlp(agent, agent, NULL);
         exit(EXIT_FAILURE);
     }
 
   fail:
     crm_free(args);
 
     if (p_read_fd >= 0) {
         close(p_read_fd);
     }
     if (p_write_fd >= 0) {
         close(p_write_fd);
     }
 
     if (c_read_fd >= 0) {
         close(c_read_fd);
     }
     if (c_write_fd >= 0) {
         close(c_write_fd);
     }
 
     return rc;
 }
 
 static int
 stonith_api_device_list(stonith_t * stonith, int call_options, const char *namespace,
                         stonith_key_value_t ** devices, int timeout)
 {
     int count = 0;
 
     if (devices == NULL) {
         crm_err("Parameter error: stonith_api_device_list");
         return -2;
     }
 
     /* Include Heartbeat agents */
     if (namespace == NULL || safe_str_eq("heartbeat", namespace)) {
         char **entry = NULL;
         char **type_list = stonith_types();
 
         for (entry = type_list; entry != NULL && *entry; ++entry) {
             crm_trace("Added: %s", *entry);
             *devices = stonith_key_value_add(*devices, NULL, *entry);
             count++;
         }
         if (type_list) {
             stonith_free_hostlist(type_list);
         }
     }
 
     /* Include Red Hat agents, basically: ls -1 @sbin_dir@/fence_* */
     if (namespace == NULL || safe_str_eq("redhat", namespace)) {
         struct dirent **namelist;
         int file_num = scandir(RH_STONITH_DIR, &namelist, 0, alphasort);
 
         if (file_num > 0) {
             struct stat prop;
             char buffer[FILENAME_MAX + 1];
 
             while (file_num--) {
                 if ('.' == namelist[file_num]->d_name[0]) {
                     free(namelist[file_num]);
                     continue;
 
                 } else if (0 != strncmp(RH_STONITH_PREFIX,
                                         namelist[file_num]->d_name, strlen(RH_STONITH_PREFIX))) {
                     free(namelist[file_num]);
                     continue;
                 }
 
                 snprintf(buffer, FILENAME_MAX, "%s/%s", RH_STONITH_DIR, namelist[file_num]->d_name);
                 if (stat(buffer, &prop) == 0 && S_ISREG(prop.st_mode)) {
                     *devices = stonith_key_value_add(*devices, NULL, namelist[file_num]->d_name);
                     count++;
                 }
 
                 free(namelist[file_num]);
             }
             free(namelist);
         }
     }
 
     return count;
 }
 
 static int
 stonith_api_device_metadata(stonith_t * stonith, int call_options, const char *agent,
                             const char *namespace, char **output, int timeout)
 {
     int rc = 0;
     int bufferlen = 0;
 
     char *buffer = NULL;
     char *xml_meta_longdesc = NULL;
     char *xml_meta_shortdesc = NULL;
 
     char *meta_param = NULL;
     char *meta_longdesc = NULL;
     char *meta_shortdesc = NULL;
     const char *provider = get_stonith_provider(agent, namespace);
 
     Stonith *stonith_obj = NULL;
     static const char *no_parameter_info = "<!-- no value -->";
 
     crm_trace("looking up %s/%s metadata", agent, provider);
 
     /* By having this in a library, we can access it from stonith_admin
      *  when neither lrmd or stonith-ng are running
      * Important for the crm shell's validations...
      */
 
     if (safe_str_eq(provider, "redhat")) {
 
         int exec_rc = run_stonith_agent(agent, "metadata", NULL, NULL, NULL, &rc, &buffer, NULL);
 
         if (exec_rc < 0 || rc != 0 || buffer == NULL) {
             /* failed */
             crm_debug("Query failed: %d %d: %s", exec_rc, rc, crm_str(buffer));
 
             /* provide a fake metadata entry */
             meta_longdesc = crm_strdup(no_parameter_info);
             meta_shortdesc = crm_strdup(no_parameter_info);
             meta_param = crm_strdup("  <parameters>\n"
                                     "    <parameter name=\"action\">\n"
                                     "      <getopt mixed=\"-o\" />\n"
                                     "      <content type=\"string\" default=\"reboot\" />\n"
                                     "      <shortdesc lang=\"en\">Fencing action (null, off, on, [reboot], status, hostlist, devstatus)</shortdesc>\n"
                                     "    </parameter>\n" "  </parameters>");
 
             goto build;
 
         } else {
 
             xmlNode *xml = string2xml(buffer);
             xmlNode *actions = NULL;
             xmlXPathObject *xpathObj = NULL;
 
             xpathObj = xpath_search(xml, "//actions");
             if (xpathObj && xpathObj->nodesetval->nodeNr > 0) {
                 actions = getXpathResult(xpathObj, 0);
             }
 
             /* Now fudge the metadata so that the start/stop actions appear */
             xpathObj = xpath_search(xml, "//action[@name='stop']");
             if (xpathObj == NULL || xpathObj->nodesetval->nodeNr <= 0) {
                 xmlNode *tmp = NULL;
 
                 tmp = create_xml_node(actions, "action");
                 crm_xml_add(tmp, "name", "stop");
                 crm_xml_add(tmp, "timeout", "20s");
 
                 tmp = create_xml_node(actions, "action");
                 crm_xml_add(tmp, "name", "start");
                 crm_xml_add(tmp, "timeout", "20s");
             }
 
             /* Now fudge the metadata so that the port isn't required in the configuration */
             xpathObj = xpath_search(xml, "//parameter[@name='port']");
             if (xpathObj && xpathObj->nodesetval->nodeNr > 0) {
                 /* We'll fill this in */
                 xmlNode *tmp = getXpathResult(xpathObj, 0);
 
                 crm_xml_add(tmp, "required", "0");
             }
 
             crm_free(buffer);
             buffer = dump_xml_formatted(xml);
             free_xml(xml);
         }
 
     } else {
         stonith_obj = stonith_new(agent);
 
         meta_longdesc = crm_strdup(stonith_get_info(stonith_obj, ST_DEVICEDESCR));
         if (meta_longdesc == NULL) {
             crm_warn("no long description in %s's metadata.", agent);
             meta_longdesc = crm_strdup(no_parameter_info);
         }
 
         meta_shortdesc = crm_strdup(stonith_get_info(stonith_obj, ST_DEVICEID));
         if (meta_shortdesc == NULL) {
             crm_warn("no short description in %s's metadata.", agent);
             meta_shortdesc = crm_strdup(no_parameter_info);
         }
 
         meta_param = crm_strdup(stonith_get_info(stonith_obj, ST_CONF_XML));
         if (meta_param == NULL) {
             crm_warn("no list of parameters in %s's metadata.", agent);
             meta_param = crm_strdup(no_parameter_info);
         }
 
   build:
         xml_meta_longdesc =
             (char *)xmlEncodeEntitiesReentrant(NULL, (const unsigned char *)meta_longdesc);
         xml_meta_shortdesc =
             (char *)xmlEncodeEntitiesReentrant(NULL, (const unsigned char *)meta_shortdesc);
 
         bufferlen = strlen(META_TEMPLATE) + strlen(agent)
             + strlen(xml_meta_longdesc) + strlen(xml_meta_shortdesc)
             + strlen(meta_param) + 1;
 
         crm_malloc0(buffer, bufferlen);
         snprintf(buffer, bufferlen - 1, META_TEMPLATE,
                  agent, xml_meta_longdesc, xml_meta_shortdesc, meta_param);
 
         xmlFree(xml_meta_longdesc);
         xmlFree(xml_meta_shortdesc);
 
         if (stonith_obj) {
             stonith_delete(stonith_obj);
         }
 
         crm_free(meta_shortdesc);
         crm_free(meta_longdesc);
         crm_free(meta_param);
     }
 
     if (output) {
         *output = buffer;
 
     } else {
         crm_free(buffer);
     }
 
     return rc;
 }
 
 static int
 stonith_api_query(stonith_t * stonith, int call_options, const char *target,
                   stonith_key_value_t ** devices, int timeout)
 {
     int rc = 0, lpc = 0, max = 0;
 
     xmlNode *data = NULL;
     xmlNode *output = NULL;
     xmlXPathObjectPtr xpathObj = NULL;
 
     CRM_CHECK(devices != NULL, return st_err_missing);
 
     data = create_xml_node(NULL, F_STONITH_DEVICE);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add(data, F_STONITH_TARGET, target);
     rc = stonith_send_command(stonith, STONITH_OP_QUERY, data, &output, call_options, timeout);
 
     if (rc < 0) {
         return rc;
     }
 
     xpathObj = xpath_search(output, "//@agent");
     if (xpathObj) {
         max = xpathObj->nodesetval->nodeNr;
 
         for (lpc = 0; lpc < max; lpc++) {
             xmlNode *match = getXpathResult(xpathObj, lpc);
 
             CRM_CHECK(match != NULL, continue);
 
             crm_info("%s[%d] = %s", "//@agent", lpc, xmlGetNodePath(match));
             *devices = stonith_key_value_add(*devices, NULL, crm_element_value(match, XML_ATTR_ID));
         }
     }
 
     free_xml(output);
     free_xml(data);
     return max;
 }
 
 static int
 stonith_api_call(stonith_t * stonith, int call_options, const char *id, const char *action,
                  const char *victim, int timeout)
 {
     int rc = 0;
     xmlNode *data = NULL;
 
     data = create_xml_node(NULL, F_STONITH_DEVICE);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add(data, F_STONITH_DEVICE, id);
     crm_xml_add(data, F_STONITH_ACTION, action);
     crm_xml_add(data, F_STONITH_TARGET, victim);
 
     rc = stonith_send_command(stonith, STONITH_OP_EXEC, data, NULL, call_options, timeout);
     free_xml(data);
 
     return rc;
 }
 
 static int
 stonith_api_fence(stonith_t * stonith, int call_options, const char *node, const char *action,
                   int timeout)
 {
     int rc = 0;
     xmlNode *data = NULL;
 
     data = create_xml_node(NULL, __FUNCTION__);
     crm_xml_add(data, F_STONITH_TARGET, node);
     crm_xml_add(data, F_STONITH_ACTION, action);
     crm_xml_add_int(data, F_STONITH_TIMEOUT, timeout);
 
     rc = stonith_send_command(stonith, STONITH_OP_FENCE, data, NULL, call_options, timeout);
     free_xml(data);
 
     return rc;
 }
 
 static int
 stonith_api_confirm(stonith_t * stonith, int call_options, const char *target)
 {
     return stonith_api_fence(stonith, call_options | st_opt_manual_ack, target, "off", 0);
 }
 
 static int
 stonith_api_history(stonith_t * stonith, int call_options, const char *node,
                     stonith_history_t ** history, int timeout)
 {
     int rc = 0;
     xmlNode *data = NULL;
     xmlNode *output = NULL;
     stonith_history_t *last = NULL;
 
     *history = NULL;
 
     if (node) {
         data = create_xml_node(NULL, __FUNCTION__);
         crm_xml_add(data, F_STONITH_TARGET, node);
     }
 
     rc = stonith_send_command(stonith, STONITH_OP_FENCE_HISTORY, data, &output,
                               call_options | st_opt_sync_call, timeout);
     free_xml(data);
 
     if (rc == 0) {
         xmlNode *op = NULL;
         xmlNode *reply = get_xpath_object("//" F_STONITH_HISTORY_LIST, output, LOG_ERR);
 
         for (op = __xml_first_child(reply); op != NULL; op = __xml_next(op)) {
             stonith_history_t *kvp;
 
             crm_malloc0(kvp, sizeof(stonith_history_t));
             kvp->target = crm_element_value_copy(op, F_STONITH_TARGET);
             kvp->action = crm_element_value_copy(op, F_STONITH_ACTION);
             kvp->origin = crm_element_value_copy(op, F_STONITH_ORIGIN);
             kvp->delegate = crm_element_value_copy(op, F_STONITH_DELEGATE);
             crm_element_value_int(op, F_STONITH_DATE, &kvp->completed);
             crm_element_value_int(op, F_STONITH_STATE, &kvp->state);
 
             if (last) {
                 last->next = kvp;
             } else {
                 *history = kvp;
             }
             last = kvp;
         }
     }
     return rc;
 }
 
 const char *
 stonith_error2string(enum stonith_errors return_code)
 {
     const char *error_msg = NULL;
 
     switch (return_code) {
         case stonith_ok:
             error_msg = "OK";
             break;
         case st_err_not_supported:
             error_msg = "Not supported";
             break;
         case st_err_authentication:
             error_msg = "Not authenticated";
             break;
         case st_err_generic:
             error_msg = "Generic error";
             break;
         case st_err_internal:
             error_msg = "Internal error";
             break;
         case st_err_unknown_device:
             error_msg = "Unknown device";
             break;
         case st_err_unknown_operation:
             error_msg = "Unknown operation";
             break;
         case st_err_unknown_port:
             error_msg = "Unknown victim";
             break;
         case st_err_none_available:
             error_msg = "No available fencing devices";
             break;
         case st_err_connection:
             error_msg = "Not connected";
             break;
         case st_err_missing:
             error_msg = "Missing input";
             break;
         case st_err_exists:
             error_msg = "Device exists";
             break;
         case st_err_timeout:
             error_msg = "Operation timed out";
             break;
         case st_err_signal:
             error_msg = "Killed by signal";
             break;
         case st_err_ipc:
             error_msg = "IPC connection failed";
             break;
         case st_err_peer:
             error_msg = "Error from peer";
             break;
         case stonith_pending:
             error_msg = "Stonith operation is in progress";
             break;
         case st_err_agent_fork:
             error_msg = "Call to fork() failed";
             break;
         case st_err_agent_args:
             error_msg = "Could not send arguments to the stonith device";
             break;
         case st_err_agent:
             error_msg = "Execution of the stonith agent failed";
             break;
         case st_err_invalid_target:
             error_msg = "Invalid target";
             break;
         case st_err_invalid_level:
             error_msg = "Invalid fencing level specified";
             break;
     }
 
     if (error_msg == NULL) {
         crm_err("Unknown Stonith error code: %d", return_code);
         error_msg = "<unknown error>";
     }
 
     return error_msg;
 }
 
 gboolean
 is_redhat_agent(const char *agent)
 {
     int rc = 0;
     struct stat prop;
     char buffer[FILENAME_MAX + 1];
 
     snprintf(buffer, FILENAME_MAX, "%s/%s", RH_STONITH_DIR, agent);
     rc = stat(buffer, &prop);
     if (rc >= 0 && S_ISREG(prop.st_mode)) {
         return TRUE;
     }
     return FALSE;
 }
 
 const char *
 get_stonith_provider(const char *agent, const char *provider)
 {
     /* This function sucks */
     if (is_redhat_agent(agent)) {
         return "redhat";
 
     } else {
         Stonith *stonith_obj = stonith_new(agent);
 
         if (stonith_obj) {
             stonith_delete(stonith_obj);
             return "heartbeat";
         }
     }
 
     crm_err("No such device: %s", agent);
     return NULL;
 }
 
 static gint
 stonithlib_GCompareFunc(gconstpointer a, gconstpointer b)
 {
     int rc = 0;
     const stonith_notify_client_t *a_client = a;
     const stonith_notify_client_t *b_client = b;
 
     CRM_CHECK(a_client->event != NULL && b_client->event != NULL, return 0);
     rc = strcmp(a_client->event, b_client->event);
     if (rc == 0) {
         if (a_client->notify == NULL || b_client->notify == NULL) {
             return 0;
 
         } else if (a_client->notify == b_client->notify) {
             return 0;
 
         } else if (((long)a_client->notify) < ((long)b_client->notify)) {
             crm_err("callbacks for %s are not equal: %p vs. %p",
                     a_client->event, a_client->notify, b_client->notify);
             return -1;
         }
         crm_err("callbacks for %s are not equal: %p vs. %p",
                 a_client->event, a_client->notify, b_client->notify);
         return 1;
     }
     return rc;
 }
 
 xmlNode *
 stonith_create_op(int call_id, const char *token, const char *op, xmlNode * data, int call_options)
 {
     int rc = HA_OK;
     xmlNode *op_msg = create_xml_node(NULL, "stonith_command");
 
     CRM_CHECK(op_msg != NULL, return NULL);
     CRM_CHECK(token != NULL, return NULL);
 
     crm_xml_add(op_msg, F_XML_TAGNAME, "stonith_command");
 
     crm_xml_add(op_msg, F_TYPE, T_STONITH_NG);
     crm_xml_add(op_msg, F_STONITH_CALLBACK_TOKEN, token);
     crm_xml_add(op_msg, F_STONITH_OPERATION, op);
     crm_xml_add_int(op_msg, F_STONITH_CALLID, call_id);
     crm_trace("Sending call options: %.8lx, %d", (long)call_options, call_options);
     crm_xml_add_int(op_msg, F_STONITH_CALLOPTS, call_options);
 
     if (data != NULL) {
         add_message_xml(op_msg, F_STONITH_CALLDATA, data);
     }
 
     if (rc != HA_OK) {
         crm_err("Failed to create STONITH operation message");
         crm_log_xml_err(op_msg, "BadOp");
         free_xml(op_msg);
         return NULL;
     }
 
     return op_msg;
 }
 
 static void
 stonith_destroy_op_callback(gpointer data)
 {
     stonith_callback_client_t *blob = data;
 
     if (blob->timer && blob->timer->ref > 0) {
         g_source_remove(blob->timer->ref);
     }
     crm_free(blob->timer);
     crm_free(blob);
 }
 
 static int
 stonith_api_signoff(stonith_t * stonith)
 {
     stonith_private_t *native = stonith->private;
 
     crm_debug("Signing out of the STONITH Service");
 
     if(native->source) {
         mainloop_del_ipc_client(native->source);
         native->source = NULL;
         native->ipc = NULL;
         
     } else if (native->ipc != NULL) {
         crm_ipc_close(native->ipc);
         crm_ipc_destroy(native->ipc);
         native->ipc = NULL;
     }
 
     stonith->state = stonith_disconnected;
     return stonith_ok;
 }
 
 static int
 stonith_api_signon(stonith_t * stonith, const char *name, int *stonith_fd)
 {
     int rc = stonith_ok;
     stonith_private_t *native = stonith->private;
     static struct ipc_client_callbacks st_callbacks = 
         {
             .dispatch = stonith_dispatch_internal,
             .destroy = stonith_connection_destroy
         };
 
     crm_trace("Connecting command channel");
 
     stonith->state = stonith_connected_command;
     if(stonith_fd) {
         /* No mainloop */
         native->ipc = crm_ipc_new("stonith-ng", 0);
         
         if(native->ipc && crm_ipc_connect(native->ipc)) {
             *stonith_fd = crm_ipc_get_fd(native->ipc);
 
         } else if(native->ipc) {
             rc = st_err_connection;
         }
 
     } else {
         /* With mainloop */
         native->source = mainloop_add_ipc_client("stonith-ng", 0, stonith, &st_callbacks);
         native->ipc = mainloop_get_ipc_client(native->source);
     }
     
     if (native->ipc == NULL) {
         crm_debug("Could not connect to the Stonith API");
         rc = st_err_connection;
     }
 
     if (rc == stonith_ok) {
         xmlNode *reply = NULL;
         xmlNode *hello = create_xml_node(NULL, "stonith_command");
 
         crm_xml_add(hello, F_TYPE, T_STONITH_NG);
         crm_xml_add(hello, F_STONITH_OPERATION, CRM_OP_REGISTER);
         crm_xml_add(hello, F_STONITH_CLIENTNAME, name);
         rc = crm_ipc_send(native->ipc, hello, &reply, -1);
 
         if(rc < 0) {
             crm_perror(LOG_DEBUG, "Couldn't complete registration with the fencing API: %d", rc);
             rc = st_err_ipc;
 
         } else if(reply == NULL) {
             crm_err("Did not receive registration reply");
             rc = st_err_internal;
 
         } else {
             const char *msg_type = crm_element_value(reply, F_STONITH_OPERATION);
             const char *tmp_ticket = crm_element_value(reply, F_STONITH_CLIENTID);
             
             if (safe_str_neq(msg_type, CRM_OP_REGISTER)) {
                 crm_err("Invalid registration message: %s", msg_type);
                 crm_log_xml_err(reply, "Bad reply");
                 rc = st_err_internal;
                 
             } else if (tmp_ticket == NULL) {
                 crm_err("No registration token provided");
                 crm_log_xml_err(reply, "Bad reply");
                 rc = st_err_internal;
                 
             } else {
                 crm_trace("Obtained registration token: %s", tmp_ticket);
                 native->token = crm_strdup(tmp_ticket);
                 rc = stonith_ok;
             }
         }
         
         free_xml(reply);
         free_xml(hello);
     }
 
     if (rc == stonith_ok) {
 #if HAVE_MSGFROMIPC_TIMEOUT
         stonith->call_timeout = MAX_IPC_DELAY;
 #endif
         crm_debug("Connection to STONITH successful");
         return stonith_ok;
     }
 
     crm_debug("Connection to STONITH failed: %s", stonith_error2string(rc));
     stonith->cmds->disconnect(stonith);
     return rc;
 }
 
 static int
 stonith_set_notification(stonith_t * stonith, const char *callback, int enabled)
 {
     xmlNode *notify_msg = create_xml_node(NULL, __FUNCTION__);
     stonith_private_t *native = stonith->private;
 
     if (stonith->state != stonith_disconnected) {
         int rc;
 
         crm_xml_add(notify_msg, F_STONITH_OPERATION, T_STONITH_NOTIFY);
         if (enabled) {
             crm_xml_add(notify_msg, F_STONITH_NOTIFY_ACTIVATE, callback);
         } else {
             crm_xml_add(notify_msg, F_STONITH_NOTIFY_DEACTIVATE, callback);
         }
         rc = crm_ipc_send(native->ipc, notify_msg, NULL, -1);
         if(rc < 0) {
             crm_perror(LOG_DEBUG, "Couldn't register for fencing notifications: %d", rc);
             rc = st_err_ipc;
         }
     }
 
     free_xml(notify_msg);
     return stonith_ok;
 }
 
 static int
 stonith_api_add_notification(stonith_t * stonith, const char *event,
                              void (*callback) (stonith_t * stonith, const char *event,
                                                xmlNode * msg))
 {
     GList *list_item = NULL;
     stonith_notify_client_t *new_client = NULL;
     stonith_private_t *private = NULL;
 
     private = stonith->private;
     crm_trace("Adding callback for %s events (%d)", event, g_list_length(private->notify_list));
 
     crm_malloc0(new_client, sizeof(stonith_notify_client_t));
     new_client->event = event;
     new_client->notify = callback;
 
     list_item = g_list_find_custom(private->notify_list, new_client, stonithlib_GCompareFunc);
 
     if (list_item != NULL) {
         crm_warn("Callback already present");
         crm_free(new_client);
         return st_err_exists;
 
     } else {
         private->notify_list = g_list_append(private->notify_list, new_client);
 
         stonith_set_notification(stonith, event, 1);
 
         crm_trace("Callback added (%d)", g_list_length(private->notify_list));
     }
     return stonith_ok;
 }
 
 static int
 stonith_api_del_notification(stonith_t * stonith, const char *event)
 {
     GList *list_item = NULL;
     stonith_notify_client_t *new_client = NULL;
     stonith_private_t *private = NULL;
 
     crm_debug("Removing callback for %s events", event);
 
     private = stonith->private;
     crm_malloc0(new_client, sizeof(stonith_notify_client_t));
     new_client->event = event;
     new_client->notify = NULL;
 
     list_item = g_list_find_custom(private->notify_list, new_client, stonithlib_GCompareFunc);
 
     stonith_set_notification(stonith, event, 0);
 
     if (list_item != NULL) {
         stonith_notify_client_t *list_client = list_item->data;
 
         private->notify_list = g_list_remove(private->notify_list, list_client);
         crm_free(list_client);
 
         crm_trace("Removed callback");
 
     } else {
         crm_trace("Callback not present");
     }
     crm_free(new_client);
     return stonith_ok;
 }
 
 static gboolean
 stonith_async_timeout_handler(gpointer data)
 {
     struct timer_rec_s *timer = data;
 
     crm_debug("Async call %d timed out after %dms", timer->call_id, timer->timeout);
     stonith_perform_callback(timer->stonith, NULL, timer->call_id, st_err_timeout);
 
     /* Always return TRUE, never remove the handler
      * We do that in stonith_del_callback()
      */
     return TRUE;
 }
 
 static int
 stonith_api_add_callback(stonith_t * stonith, int call_id, int timeout, bool only_success,
                          void *user_data, const char *callback_name,
                          void (*callback) (stonith_t * st, const xmlNode * msg, int call, int rc,
                                            xmlNode * output, void *userdata))
 {
     stonith_callback_client_t *blob = NULL;
     stonith_private_t *private = NULL;
 
     CRM_CHECK(stonith != NULL, return st_err_missing);
     CRM_CHECK(stonith->private != NULL, return st_err_missing);
     private = stonith->private;
 
     if (call_id == 0) {
         private->op_callback = callback;
 
     } else if (call_id < 0) {
         if (only_success == FALSE) {
             crm_trace("Call failed, calling %s: %s",
                       callback_name, stonith_error2string(call_id));
             callback(stonith, NULL, call_id, call_id, NULL, user_data);
         } else {
             crm_warn("STONITH call failed: %s", stonith_error2string(call_id));
         }
         return FALSE;
     }
 
     crm_malloc0(blob, sizeof(stonith_callback_client_t));
     blob->id = callback_name;
     blob->only_success = only_success;
     blob->user_data = user_data;
     blob->callback = callback;
 
     if (timeout > 0) {
         struct timer_rec_s *async_timer = NULL;
 
         crm_malloc0(async_timer, sizeof(struct timer_rec_s));
         blob->timer = async_timer;
 
         async_timer->stonith = stonith;
         async_timer->call_id = call_id;
         async_timer->timeout = timeout * 1100;
         async_timer->ref =
             g_timeout_add(async_timer->timeout, stonith_async_timeout_handler, async_timer);
     }
 
     g_hash_table_insert(private->stonith_op_callback_table, GINT_TO_POINTER(call_id), blob);
     crm_trace("Added callback to %s for call %d", callback_name, call_id);
 
     return TRUE;
 }
 
 static int
 stonith_api_del_callback(stonith_t * stonith, int call_id, bool all_callbacks)
 {
     stonith_private_t *private = stonith->private;
 
     if (all_callbacks) {
         private->op_callback = NULL;
         g_hash_table_destroy(private->stonith_op_callback_table);
         private->stonith_op_callback_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
                                                                    NULL,
                                                                    stonith_destroy_op_callback);
 
     } else if (call_id == 0) {
         private->op_callback = NULL;
 
     } else {
         g_hash_table_remove(private->stonith_op_callback_table, GINT_TO_POINTER(call_id));
     }
     return stonith_ok;
 }
 
 static void
 stonith_dump_pending_op(gpointer key, gpointer value, gpointer user_data)
 {
     int call = GPOINTER_TO_INT(key);
     stonith_callback_client_t *blob = value;
 
     crm_debug("Call %d (%s): pending", call, crm_str(blob->id));
 }
 
 void
 stonith_dump_pending_callbacks(stonith_t * stonith)
 {
     stonith_private_t *private = stonith->private;
 
     if (private->stonith_op_callback_table == NULL) {
         return;
     }
     return g_hash_table_foreach(private->stonith_op_callback_table, stonith_dump_pending_op, NULL);
 }
 
 void
 stonith_perform_callback(stonith_t * stonith, xmlNode * msg, int call_id, int rc)
 {
     xmlNode *output = NULL;
     stonith_private_t *private = NULL;
     stonith_callback_client_t *blob = NULL;
     stonith_callback_client_t local_blob;
 
     CRM_CHECK(stonith != NULL, return);
     CRM_CHECK(stonith->private != NULL, return);
 
     private = stonith->private;
 
     local_blob.id = NULL;
     local_blob.callback = NULL;
     local_blob.user_data = NULL;
     local_blob.only_success = FALSE;
 
     if (msg != NULL) {
         crm_element_value_int(msg, F_STONITH_RC, &rc);
         crm_element_value_int(msg, F_STONITH_CALLID, &call_id);
         output = get_message_xml(msg, F_STONITH_CALLDATA);
     }
 
     CRM_CHECK(call_id > 0, crm_log_xml_err(msg, "Bad result"));
 
     blob = g_hash_table_lookup(private->stonith_op_callback_table, GINT_TO_POINTER(call_id));
 
     if (blob != NULL) {
         local_blob = *blob;
         blob = NULL;
 
         stonith_api_del_callback(stonith, call_id, FALSE);
 
     } else {
         crm_trace("No callback found for call %d", call_id);
         local_blob.callback = NULL;
     }
 
     if (stonith == NULL) {
         crm_debug("No stonith object supplied");
     }
 
     if (local_blob.callback != NULL && (rc == stonith_ok || local_blob.only_success == FALSE)) {
         crm_trace("Invoking callback %s for call %d", crm_str(local_blob.id), call_id);
         local_blob.callback(stonith, msg, call_id, rc, output, local_blob.user_data);
 
     } else if (private->op_callback == NULL && rc != stonith_ok) {
         crm_warn("STONITH command failed: %s", stonith_error2string(rc));
         crm_log_xml_debug(msg, "Failed STONITH Update");
     }
 
     if (private->op_callback != NULL) {
         crm_trace("Invoking global callback for call %d", call_id);
         private->op_callback(stonith, msg, call_id, rc, output, NULL);
     }
     crm_trace("OP callback activated.");
 }
 
 static void
 stonith_send_notification(gpointer data, gpointer user_data)
 {
     struct notify_blob_s *blob = user_data;
     stonith_notify_client_t *entry = data;
     const char *event = NULL;
 
     if (blob->xml == NULL) {
         crm_warn("Skipping callback - NULL message");
         return;
     }
 
     event = crm_element_value(blob->xml, F_SUBTYPE);
 
     if (entry == NULL) {
         crm_warn("Skipping callback - NULL callback client");
         return;
 
     } else if (entry->notify == NULL) {
         crm_warn("Skipping callback - NULL callback");
         return;
 
     } else if (safe_str_neq(entry->event, event)) {
         crm_trace("Skipping callback - event mismatch %p/%s vs. %s", entry, entry->event, event);
         return;
     }
 
     crm_trace("Invoking callback for %p/%s event...", entry, event);
     entry->notify(blob->stonith, event, blob->xml);
     crm_trace("Callback invoked...");
 }
 
 int
 stonith_send_command(stonith_t * stonith, const char *op, xmlNode * data, xmlNode ** output_data,
                      int call_options, int timeout)
 {
     int rc = 0;
     int reply_id = -1;
 
     xmlNode *op_msg = NULL;
     xmlNode *op_reply = NULL;
 
     stonith_private_t *native = stonith->private;
 
     if (stonith->state == stonith_disconnected) {
         return st_err_connection;
     }
 
     if (output_data != NULL) {
         *output_data = NULL;
     }
 
     if (op == NULL) {
         crm_err("No operation specified");
         return st_err_missing;
     }
 
     stonith->call_id++;
     /* prevent call_id from being negative (or zero) and conflicting
      *    with the stonith_errors enum
      * use 2 because we use it as (stonith->call_id - 1) below
      */
     if (stonith->call_id < 1) {
         stonith->call_id = 1;
     }
 
     CRM_CHECK(native->token != NULL,;);
     op_msg = stonith_create_op(stonith->call_id, native->token, op, data, call_options);
     if (op_msg == NULL) {
         return st_err_missing;
     }
 
     crm_xml_add_int(op_msg, F_STONITH_TIMEOUT, timeout);
     crm_trace("Sending %s message to STONITH service, Timeout: %ds", op, timeout);
 
     rc = crm_ipc_send(native->ipc, op_msg, &op_reply, 1000*timeout);
     free_xml(op_msg);
 
     if(rc < 0) {
         crm_perror(LOG_ERR, "Couldn't perform %s operation (timeout=%ds): %d", op, timeout, rc);
         rc = st_err_ipc;
         goto done;
     }
 
     crm_log_xml_trace(op_reply, "Reply");
     
     if (!(call_options & st_opt_sync_call)) {
         crm_trace("Async call %d, returning", stonith->call_id);
         CRM_CHECK(stonith->call_id != 0, return st_err_internal);
         free_xml(op_reply);
 
         return stonith->call_id;
     }
 
     rc = stonith_ok;
     crm_element_value_int(op_reply, F_STONITH_CALLID, &reply_id);
 
     if (reply_id == stonith->call_id) {
         crm_trace("Syncronous reply %d received", reply_id);
 
         if (crm_element_value_int(op_reply, F_STONITH_RC, &rc) != 0) {
             rc = st_err_peer;
         }
 
         if ((call_options & st_opt_discard_reply) || output_data == NULL) {
             crm_trace("Discarding reply");
 
         } else {
             *output_data = op_reply;
             op_reply = NULL; /* Prevent subsequent free */
         }
         
     } else if (reply_id <= 0) {
         crm_err("Recieved bad reply: No id set");
         crm_log_xml_err(op_reply, "Bad reply");
         free_xml(op_reply);
         rc = st_err_peer;
         
     } else {
         crm_err("Recieved bad reply: %d (wanted %d)", reply_id, stonith->call_id);
         crm_log_xml_err(op_reply, "Old reply");
         free_xml(op_reply);
         rc = st_err_peer;
     }
 
   done:
     if (crm_ipc_connected(native->ipc) == FALSE) {
         crm_err("STONITH disconnected");
         stonith->state = stonith_disconnected;
     }
 
     free_xml(op_reply);
     return rc;
 }
 
 /* Not used with mainloop */
 bool
 stonith_dispatch(stonith_t * st)
 {
     gboolean stay_connected = TRUE;
     stonith_private_t *private = NULL;
 
     CRM_ASSERT(st != NULL);
     private = st->private;
     
     while(crm_ipc_ready(private->ipc)) {
 
         if(crm_ipc_read(private->ipc) > 0) {
             const char *msg = crm_ipc_buffer(private->ipc);
             stonith_dispatch_internal(msg, strlen(msg), st);
         }
 
         if(crm_ipc_connected(private->ipc) == FALSE) {
             crm_err("Connection closed");
             stay_connected = FALSE;
         }
     }
 
     return stay_connected;
 }
 
 int
 stonith_dispatch_internal(const char *buffer, ssize_t length, gpointer userdata)
 {
     const char *type = NULL;
     struct notify_blob_s blob;
 
     stonith_t * st = userdata;
     stonith_private_t *private = NULL;
 
     CRM_ASSERT(st != NULL);
     private = st->private;
 
     blob.xml = string2xml(buffer);
     if (blob.xml == NULL) {
         crm_warn("Received a NULL msg from STONITH service: %s.", buffer);
         return 0;
     }
 
     /* do callbacks */
     type = crm_element_value(blob.xml, F_TYPE);
     crm_trace("Activating %s callbacks...", type);
 
     if (safe_str_eq(type, T_STONITH_NG)) {
         stonith_perform_callback(st, blob.xml, 0, 0);
 
     } else if (safe_str_eq(type, T_STONITH_NOTIFY)) {
         g_list_foreach(private->notify_list, stonith_send_notification, &blob);
 
     } else {
         crm_err("Unknown message type: %s", type);
         crm_log_xml_warn(blob.xml, "BadReply");
     }
 
     free_xml(blob.xml);
     return 1;
 }
 
 static int
 stonith_api_free(stonith_t * stonith)
 {
     int rc = stonith_ok;
 
     if (stonith->state != stonith_disconnected) {
         rc = stonith->cmds->disconnect(stonith);
     }
 
     if (stonith->state == stonith_disconnected) {
         stonith_private_t *private = stonith->private;
 
         g_hash_table_destroy(private->stonith_op_callback_table);
         crm_free(private->token);
         crm_free(stonith->private);
         crm_free(stonith->cmds);
         crm_free(stonith);
     }
 
     return rc;
 }
 
 void
 stonith_api_delete(stonith_t * stonith)
 {
     stonith_private_t *private = stonith->private;
     GList *list = private->notify_list;
 
     while (list != NULL) {
         stonith_notify_client_t *client = g_list_nth_data(list, 0);
 
         list = g_list_remove(list, client);
         crm_free(client);
     }
 
     stonith->cmds->free(stonith);
     stonith = NULL;
 }
 
 stonith_t *
 stonith_api_new(void)
 {
     stonith_t *new_stonith = NULL;
     stonith_private_t *private = NULL;
 
     crm_malloc0(new_stonith, sizeof(stonith_t));
     crm_malloc0(private, sizeof(stonith_private_t));
     new_stonith->private = private;
 
     private->stonith_op_callback_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
                                                                NULL, stonith_destroy_op_callback);
     private->notify_list = NULL;
 
     new_stonith->call_id = 1;
     new_stonith->state = stonith_disconnected;
 
     crm_malloc0(new_stonith->cmds, sizeof(stonith_api_operations_t));
 
 /* *INDENT-OFF* */
     new_stonith->cmds->free       = stonith_api_free;
     new_stonith->cmds->connect    = stonith_api_signon;
     new_stonith->cmds->disconnect = stonith_api_signoff;
     
     new_stonith->cmds->call       = stonith_api_call;
     new_stonith->cmds->fence      = stonith_api_fence;
     new_stonith->cmds->confirm    = stonith_api_confirm;
     new_stonith->cmds->history    = stonith_api_history;
 
     new_stonith->cmds->list       = stonith_api_device_list;
     new_stonith->cmds->metadata   = stonith_api_device_metadata;
 
     new_stonith->cmds->query           = stonith_api_query;
     new_stonith->cmds->remove_device   = stonith_api_remove_device;
     new_stonith->cmds->register_device = stonith_api_register_device;
 
     new_stonith->cmds->remove_level    = stonith_api_remove_level;
     new_stonith->cmds->register_level  = stonith_api_register_level;
     
     new_stonith->cmds->remove_callback       = stonith_api_del_callback;	
     new_stonith->cmds->register_callback     = stonith_api_add_callback;	
     new_stonith->cmds->remove_notification   = stonith_api_del_notification;
     new_stonith->cmds->register_notification = stonith_api_add_notification;
 /* *INDENT-ON* */
 
     return new_stonith;
 }
 
 stonith_key_value_t *
 stonith_key_value_add(stonith_key_value_t * head, const char *key, const char *value)
 {
     stonith_key_value_t *p, *end;
 
     crm_malloc0(p, sizeof(stonith_key_value_t));
     if (key) {
         p->key = crm_strdup(key);
     }
     if (value) {
         p->value = crm_strdup(value);
     }
 
     end = head;
     while (end && end->next) {
         end = end->next;
     }
 
     if (end) {
         end->next = p;
     } else {
         head = p;
     }
 
     return head;
 }
 
 void
 stonith_key_value_freeall(stonith_key_value_t * head, int keys, int values)
 {
     stonith_key_value_t *p;
 
     while (head) {
         p = head->next;
         if (keys) {
             free(head->key);
         }
         if (values) {
             free(head->value);
         }
         free(head);
         head = p;
     }
 }
 
 int
 stonith_api_kick(int nodeid, const char *uname, int timeout, bool off)
 {
     char *name = NULL;
     const char *action = "reboot";
 
     int rc = st_err_internal;
     stonith_t *st = NULL;
     enum stonith_call_options opts = st_opt_sync_call | st_opt_allow_suicide;
 
     st = stonith_api_new();
     if (st) {
         rc = st->cmds->connect(st, "stonith-api", NULL);
     }
 
     if (uname != NULL) {
         name = strdup(uname);
 
     } else if (nodeid > 0) {
         opts |= st_opt_cs_nodeid;
         name = crm_itoa(nodeid);
     }
 
     if (off) {
         action = "off";
     }
 
     if (rc == stonith_ok) {
         rc = st->cmds->fence(st, opts, name, action, timeout);
     }
 
     if (st) {
         st->cmds->disconnect(st);
         stonith_api_delete(st);
     }
 
     crm_free(name);
     return rc;
 }
 
 time_t
 stonith_api_time(int nodeid, const char *uname, bool in_progress)
 {
     int rc = 0;
     char *name = NULL;
 
     time_t when = 0;
     time_t progress = 0;
     stonith_t *st = NULL;
     stonith_history_t *history, *hp = NULL;
     enum stonith_call_options opts = st_opt_sync_call;
 
     st = stonith_api_new();
     if (st) {
         rc = st->cmds->connect(st, "stonith-api", NULL);
     }
 
     if (uname != NULL) {
         name = strdup(uname);
 
     } else if (nodeid > 0) {
         opts |= st_opt_cs_nodeid;
         name = crm_itoa(nodeid);
     }
 
     if (st && rc == stonith_ok) {
         st->cmds->history(st, st_opt_sync_call | st_opt_cs_nodeid, name, &history, 120);
 
         for (hp = history; hp; hp = hp->next) {
             if (in_progress) {
                 if (hp->state != st_done && hp->state != st_failed) {
                     progress = time(NULL);
                 }
 
             } else if (hp->state == st_done) {
                 when = hp->completed;
             }
         }
     }
 
     if (progress) {
         when = progress;
     }
 
     if (st) {
         st->cmds->disconnect(st);
         stonith_api_delete(st);
     }
 
     crm_free(name);
     return when;
 }