diff --git a/fencing/commands.c b/fencing/commands.c
index 12a267b868..a8c1309114 100644
--- a/fencing/commands.c
+++ b/fencing/commands.c
@@ -1,669 +1,669 @@
 /* 
  * 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.1 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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/stonith-ng.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 #include <internal.h>
 
 #define FE_AGENT_FORK		-2
 #define FE_AGENT_ERROR		-3
 
 GHashTable *device_list = NULL;
 int invoke_device(stonith_device_t *device, const char *action, const char *port, char **output);
 
 static void append_arg(
     gpointer key, gpointer value, gpointer user_data) 
 {
     int len = 3; /* =, \n, \0 */ 
     int last = 0;
     char **args = user_data;
 
 
     if(strstr(key, "pcmk-")) {
 	return;
     }
     
     len += strlen(key);
     len += strlen(value);
     if(*args != NULL) {
 	last = strlen(*args);
     }
     
     crm_realloc(*args, last+len);
     
     sprintf((*args)+last, "%s=%s\n", (char *)key, (char *)value);
 }
 
 static char *make_args(GHashTable *args)
 {
     char *arg_list = NULL;
     g_hash_table_foreach(args, append_arg, &arg_list);
     crm_debug_3("Calculated: %s", arg_list);
     return arg_list;
 }
 
 /* Borrowed from libfence */
 static int run_agent(char *agent, GHashTable *arg_hash, int *agent_result, char **output)
 {
     char *args = make_args(arg_hash);
     int pid, status, len, rc = -1;
     int pr_fd, pw_fd;  /* parent read/write file descriptors */
     int cr_fd, cw_fd;  /* child read/write file descriptors */
     int fd1[2];
     int fd2[2];
 
     cr_fd = cw_fd = pr_fd = pw_fd = -1;
 
     if (args == NULL || agent == NULL)
 	goto fail;
     len = strlen(args);
 
     if (pipe(fd1))
 	goto fail;
     pr_fd = fd1[0];
     cw_fd = fd1[1];
 
     if (pipe(fd2))
 	goto fail;
     cr_fd = fd2[0];
     pw_fd = fd2[1];
 
     pid = fork();
     if (pid < 0) {
 	*agent_result = FE_AGENT_FORK;
 	goto fail;
     }
 
     if (pid) {
 	/* parent */
 	int ret;
 
 	fcntl(pr_fd, F_SETFL, fcntl(pr_fd, F_GETFL, 0) | O_NONBLOCK);
 
 	do {
 	    ret = write(pw_fd, args, len);
 	} while (ret < 0 && errno == EINTR);
 
 	if (ret != len)
 	    goto fail;
 
 	close(pw_fd);
 
 	/* TODO: Get the result asynchronously */
 	waitpid(pid, &status, 0);
 
 	if(output != NULL) {
 	    len = 0;
 	    do {
 		char buf[500];
 		ret = read(pr_fd, buf, 500);
 		if(ret > 0) {
 		    buf[ret] = 0;
 		    crm_realloc(*output, len + ret + 1);
 		    sprintf((*output)+len, "%s", buf);
 		    len += ret;
 		}
 		
 	    } while (ret == 500 || (ret < 0 && errno == EINTR));
 	}
 	
 	*agent_result = FE_AGENT_ERROR;
 	if (WIFEXITED(status)) {
 	    *agent_result = -WEXITSTATUS(status);
 	    rc = 0;
 	}
 
     } else {
 	/* child */
 
 	close(1);
 	if (dup(cw_fd) < 0)
 	    goto fail;
 	close(2);
 	if (dup(cw_fd) < 0)
 	    goto fail;
 	close(0);
 	if (dup(cr_fd) < 0)
 	    goto fail;
 	/* keep cw_fd open so parent can report all errors. */
 	close(pr_fd);
 	close(cr_fd);
 	close(pw_fd);
 
 	execlp(agent, agent, NULL);
 	exit(EXIT_FAILURE);
     }
 
   fail:
     crm_free(args);
     close(pr_fd);
     close(cw_fd);
     close(cr_fd);
     close(pw_fd);
     return rc;
 }
 
 static void free_device(gpointer data)
 {
     stonith_device_t *device = data;
 
     g_hash_table_destroy(device->params);
     slist_destroy(char, item, device->targets, crm_free(item));
     crm_free(device->namespace);
     crm_free(device->agent);
     crm_free(device->id);
     crm_free(device);
 }
 
 static void build_port_aliases(stonith_device_t *device) 
 {
     char *name = NULL;
     char *value = NULL;
     int last = 0, lpc = 0, max = 0;
     
     const char *portmap = g_hash_table_lookup(device->params, "pcmk-portmap");
     if(portmap == NULL) {
 	return;
     }
     
     max = strlen(portmap);
     for(; lpc < max; lpc++) {
 	if(portmap[lpc] == 0) {
 	    break;
 	    
 	} else if(isalpha(portmap[lpc])) {
 	    /* keep going */
 	    
 	} else if(portmap[lpc] == '=') {
 	    crm_malloc0(name, 1 + lpc - last);
 	    strncpy(name, portmap + last, lpc - last);
 	    last = lpc + 1;
 	    
 	} else if(name && isspace(portmap[lpc])) {
 	    crm_malloc0(value, 1 + lpc - last);
 	    strncpy(value, portmap + last, lpc - last);
 	    last = lpc + 1;
 
 	    crm_info("Adding alias '%s'='%s' for %s", name, value, device->id);
 	    g_hash_table_replace(device->aliases, name, value);
 	    value=NULL;
 	    name=NULL;
 	    
 	} else if(isspace(portmap[lpc])) {
 	    last = lpc;
 	}   
     }
 }
 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->aliases = g_hash_table_new_full(g_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str);
     return device;
 }
 
 
 static int stonith_device_register(xmlNode *msg) 
 {
     stonith_device_t *device = build_device_from_xml(msg);
 
     build_port_aliases(device);    
     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 GListPtr parse_host_list(const char *hosts) 
 {
     int lpc = 0;
     int max = 0;
     int last = 0;
     GListPtr output = NULL;
 
     if(hosts) {
 	max = strlen(hosts);
     }
     
     for(lpc = 0; lpc < max; lpc++) {
 	if(isspace(hosts[lpc]) || hosts[lpc] == ',') {
 	    int rc = 0;
 	    char *entry = NULL;
 	    crm_malloc0(entry, 1 + lpc - last);
 	    rc = sscanf(hosts+last, "%[a-zA-Z0-9_-]", entry);
 	    if(rc == 1) {
 		crm_debug("Adding '%s'", entry);
 		output = g_list_append(output, entry);
 		entry = NULL;
 	    }
 	    
 	    crm_free(entry);
 	    last = lpc + 1;
 	}
     }
     
     return output;
 }
 
 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 const char *get_device_port(stonith_device_t *dev, const char *host) 
 {
     time_t now;
     char *alias = NULL;
 
     if(host == NULL) {
 	return NULL;
     }
     
     now = time(NULL);
     alias = g_hash_table_lookup(dev->aliases, host);
     
     if(dev->targets == NULL || dev->targets_age + 300 < now) {
 	int rc = stonith_ok;
 	char *output = NULL;
 
 	slist_destroy(char, item, dev->targets, crm_free(item));
 	dev->targets = NULL;
 
 	rc = invoke_device(dev, "list", NULL, &output);
 	if(rc == 0) {
 	    crm_info("Refreshing port list for %s", dev->id);
 	    dev->targets = parse_host_list(output);
 	    dev->targets_age = now;
 
 	} else {
 	    crm_info("Disabling port list queries for %s", dev->id);	    
 	    dev->targets_age = -1;
 	}
 	
 	crm_free(output);
     }
 
     /* See if portmap is defined and look up the translated name */
     if(alias && dev->targets == NULL) {
 	return alias;
 
     } else if(alias && string_in_list(dev->targets, alias)) {
 	return alias;
 
     } else if(dev->targets && string_in_list(dev->targets, host)) {
 	return host;
     }
 
     return NULL;
 }
 
 int invoke_device(stonith_device_t *device, const char *action, const char *port, char **output) 
 {
     int rc = 0;
     const char *device_port = get_device_port(device, port);
     if(port && device_port) {
 	g_hash_table_replace(device->params, crm_strdup("port"), crm_strdup(device_port));
 
     } else if(port) {
 	crm_err("Unknown or unhandled port '%s' for device '%s'", port, device->id);
 	return -1;
     }
 
     crm_info("Calling '%s' with action '%s'%s%s", device->id,  action, port?" on port ":"", port?port:"");
     g_hash_table_replace(device->params, crm_strdup("option"), crm_strdup(action));
     if(run_agent(device->agent, device->params, &rc, output) < 0) {
 	crm_err("Operation %s on %s failed (%d): %.100s", action, device->id, rc, *output);
 
     } else {
 	crm_info("Operation %s on %s passed: %.100s", action, device->id, *output);
     }
     g_hash_table_remove(device->params, "port");
     return rc;
 }
 
 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);
     const char *action = crm_element_value(dev, F_STONITH_ACTION);
     const char *port = crm_element_value(dev, F_STONITH_PORT);
     stonith_device_t *device = NULL;
 
     if(id) {
 	crm_info("Looking for '%s'", id);
 	device = g_hash_table_lookup(device_list, id);
 
     } else {
 	/* Check its a metadata op */
 	device = build_device_from_xml(msg);
     }
 
     if(device) {
 	rc = invoke_device(device, action, port, output);
 	
     } else {
 	crm_err("Device %s not found", id);
 	rc = 7; /* OCF return code for stopped */
     }
 
     if(id == NULL) {
 	free_device(device);
     }
     return rc;
 }
 
 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(search->host == NULL || get_device_port(dev, search->host)) {
 	search->capable = g_list_append(search->capable, value);
     }
 }
 
 static int stonith_query(xmlNode *msg, xmlNode **list) 
 {
     struct device_search_s search;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);
 	
     search.host = NULL;
     search.capable = NULL;
 
     if(dev) {
 	search.host = crm_element_value(dev, F_STONITH_TARGET);
     }
     
     crm_log_xml_info(msg, "Query");
 	
     g_hash_table_foreach(device_list, search_devices, &search);
     crm_info("Found %d matching devices for '%s'", g_list_length(search.capable), search.host);
 
     /* Pack the results into data */
     if(list) {
 	*list = create_xml_node(NULL, __FUNCTION__);
 	crm_xml_add_int(*list, "st-available-devices", g_list_length(search.capable));
 	slist_iter(device, stonith_device_t, search.capable, lpc,
 		   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);
 	    );
     }
     
     return g_list_length(search.capable);
 }
 
 static int stonith_fence(xmlNode *msg, const char *action) 
 {
     struct device_search_s search;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, msg, LOG_ERR);
 
     search.capable = NULL;
     search.host = crm_element_value(dev, F_STONITH_TARGET);
 
     crm_log_xml_info(msg, "Exec");
     
     g_hash_table_foreach(device_list, search_devices, &search);
     crm_info("Found %d matching devices for '%s'", g_list_length(search.capable), search.host);
 
     slist_iter(dev, stonith_device_t, search.capable, lpc,
 	       int rc = 0;
 	       char *output = NULL;
 	       const char *port = get_device_port(dev, search.host);
 	       CRM_CHECK(port != NULL, continue);
 	       
 	       g_hash_table_replace(dev->params, crm_strdup("option"), crm_strdup(action));
 	       g_hash_table_replace(dev->params, crm_strdup("port"), crm_strdup(port));
 
 	       if(run_agent(dev->agent, dev->params, &rc, &output) == 0) {
 		   crm_info("Terminated host '%s' with device '%s'", search.host, dev->id);
 		   crm_free(output);
 		   return stonith_ok;
 
 	       } else {
 		   crm_err("Termination of host '%s' with device '%s' failed: %s", search.host, dev->id, output);
 	       }
 	       crm_free(output);
 	);
     
     return -1;
 }
 
 static int fencing_op(
     int call_options, xmlNode *request, const char *op, gboolean is_reply, const char *remote) 
 {
     int rc = 0;
     if(is_reply) {
 	return process_remote_stonith_exec(request);
 
     } else if(remote) {
 	rc = stonith_fence(request, op);
 
     } else {
 	/* Always send to the network first */
 	return -1;
     }
 	
     if(rc == stonith_ok) {
 	do_stonith_notify(call_options, op, rc, request, remote);
     }
     return rc;
 }
 
 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_debug_4("Creating a basic reply");
     reply = create_xml_node(NULL, T_STONITH_REPLY);
-    crm_xml_add(reply, F_TYPE, T_STONITH);
+    crm_xml_add(reply, F_TYPE, T_STONITH_NG);
 
     for(lpc = 0; lpc < DIMOF(names); lpc++) {
 	name = names[lpc];
 	value = crm_element_value(request, name);
 	crm_xml_add(reply, name, value);
     }
 
     crm_xml_add_int(reply, F_STONITH_RC, rc);
     crm_xml_add(reply, "st_output", output);
 
     if(data != NULL) {
 	crm_debug_4("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 rc = stonith_ok;
     int call_options = 0;
 
     gboolean escalate = FALSE;
     gboolean is_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;
     }
     
     if(device_list == NULL) {
 	device_list = g_hash_table_new_full(
 	    g_str_hash, g_str_equal, NULL, free_device);
     }
     
     crm_info("Processing %s%s from %s", op, is_reply?" reply":"",
 	     client?client->name:remote);
     
     if(crm_str_eq(op, CRM_OP_REGISTER, TRUE)) {
 	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);
 	}
 	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_EXEC, TRUE)) {
 	rc = stonith_device_action(request, &output);
 
     } else if(crm_str_eq(op, STONITH_OP_FENCE, TRUE)) {
 	rc = fencing_op(call_options, request, "off", is_reply, remote);
 	if(is_reply == FALSE && rc < stonith_ok && remote == NULL) {
 	    escalate = TRUE;
 	}
 
     } else if(crm_str_eq(op, STONITH_OP_REBOOT, TRUE)) {
 	rc = fencing_op(call_options, request, "reboot", is_reply, remote);
 	if(is_reply == FALSE && rc < stonith_ok && remote == NULL) {
 	    escalate = TRUE;
 	}
 
     } else if(crm_str_eq(op, STONITH_OP_UNFENCE, TRUE)) {
 	rc = fencing_op(call_options, request, "on", is_reply, remote);
 	if(is_reply == FALSE && rc < stonith_ok && remote == NULL) {
 	    escalate = TRUE;
 	}
 
     } else if(crm_str_eq(op, STONITH_OP_QUERY, TRUE)) {
 	if(is_reply) {
 	    process_remote_stonith_query(request);
 	    
 	} else {
 	    rc = stonith_query(request, &data);
 	}
     }
 
     if(escalate) {
 	crm_log_xml_info(request, "Escalate");
 
 	initiate_remote_stonith_op(client, request, op);
 	
     } else if(is_reply) {
 	
     } else if(remote) {
 	reply = stonith_construct_reply(request, output, data, rc);
 	send_cluster_message(remote, crm_msg_stonith_ng, reply, FALSE);
 
     } else {
 	reply = stonith_construct_reply(request, output, data, rc);
 	do_local_reply(reply, client_id, call_options & stonith_sync_call, remote!=NULL);
 	free_xml(reply);
     }    
 
     crm_free(output);
     free_xml(data);
 }
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
index 9590db6100..6ac0fac8a3 100644
--- a/lib/fencing/st_client.c
+++ b/lib/fencing/st_client.c
@@ -1,1185 +1,1186 @@
 /*
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include <crm_internal.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 
 #include <glib.h>
 
 #include <crm/crm.h>
 #include <crm/stonith-ng.h>
 #include <crm/msg_xml.h>
 #include <crm/common/xml.h>
 
 GHashTable *stonith_op_callback_table = NULL;
 
 typedef struct stonith_private_s 
 {
 	char *token;
 	IPC_Channel	*command_channel;
 	IPC_Channel	*callback_channel;
 	GCHSource	*callback_source;
 
 	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**);
 
 gboolean stonith_dispatch(IPC_Channel *channel, gpointer user_data);
 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;
     struct notify_blob_s blob;
 
     blob.stonith = stonith;
     blob.xml = create_xml_node(NULL, "notify");;
 
     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(stonith->notify_list, stonith_send_notification, &blob);
     free_xml(blob.xml);
 }
 
 static int stonith_api_register_device(
     stonith_t *stonith, int call_options,
     const char *id, const char *namespace, const char *agent, GHashTable *params)
 {
     int rc = 0;
     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);
 
     g_hash_table_foreach(params, hash2field, args);
     
     rc = stonith_send_command(stonith, STONITH_OP_DEVICE_ADD, data, NULL, call_options, 0);
     free_xml(data);
     
     return rc;
 }
 
 static int stonith_api_remove_device(
     stonith_t *stonith, 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(stonith, STONITH_OP_DEVICE_DEL, data, NULL, call_options, 0);
     free_xml(data);
     
     return rc;
 }
 
 
 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;
     xmlNode *xml = NULL;
     xmlNode *data = NULL;
 
     data = create_xml_node(NULL, F_STONITH_DEVICE);
     crm_xml_add(data, "origin", __FUNCTION__);
     crm_xml_add(data, "agent", agent);
     crm_xml_add(data, "namespace", namespace);
     crm_xml_add(data, F_STONITH_ACTION, "metadata");
     crm_xml_add_int(data, "timeout", timeout);
 
     rc = stonith_send_command(
 	stonith, STONITH_OP_EXEC, data, &xml, call_options, timeout);
 
     if(xml && output) {
 	*output = dump_xml_formatted(first_named_child(xml, "resource-agent"));
     }
     
     free_xml(data);
     free_xml(xml);
     return rc;
 }
 
 static int stonith_api_query(
     stonith_t *stonith, int call_options, const char *target, GListPtr *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");
     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 = g_list_append(*devices, crm_element_value_copy(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 *port, 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_PORT,   port);
     crm_xml_add_int(data, "timeout", timeout);
 
     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, 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_int(data, "timeout", timeout);
 
     rc = stonith_send_command(stonith, STONITH_OP_FENCE, data, NULL, call_options, timeout);
     free_xml(data);
     
     return rc;
 }
 
 static int stonith_api_unfence(
     stonith_t *stonith, int call_options, const char *node, 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_int(data, "timeout", timeout);
 
     rc = stonith_send_command(stonith, STONITH_OP_UNFENCE, data, NULL, call_options, timeout);
     free_xml(data);
     
     return rc;
 }
 
 const char *
 stonith_error2string(enum stonith_errors return_code)
 {
     const char *error_msg = NULL;
     switch(return_code) {
 	case stonith_ok:
 	    error_msg = "";
 	    break;
 	case st_err_not_supported:
 	    error_msg = "";
 	    break;
 	case st_err_authentication:
 	    error_msg = "";
 	    break;
 	case st_err_generic:
 	    error_msg = "";
 	    break;
 	case st_err_internal:
 	    error_msg = "";
 	    break;
 	case st_err_unknown_device:
 	    error_msg = "";
 	    break;
 	case st_err_unknown_operation:
 	    error_msg = "";
 	    break;
 	case st_err_connection:
 	    error_msg = "";
 	    break;
 	case st_err_missing:
 	    error_msg = "";
 	    break;
 	case st_err_exists:
 	    error_msg = "";
 	    break;
 	case st_err_timeout:
 	    error_msg = "";
 	    break;
 	case st_err_ipc:
 	    error_msg = "";
 	    break;
 	case st_err_peer:
 	    error_msg = "";
 	    break;
     }
 			
     if(error_msg == NULL) {
 	crm_err("Unknown Stonith error code: %d", return_code);
 	error_msg = "<unknown error>";
     }
 	
     return error_msg;
 }
 
 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;
 }
 
 static int get_stonith_token(IPC_Channel *ch, char **token) 
 {
     int rc = stonith_ok;
     xmlNode *reg_msg = NULL;
     const char *msg_type = NULL;
     const char *tmp_ticket = NULL;
     
     CRM_CHECK(ch != NULL, return st_err_missing);
     CRM_CHECK(token != NULL, return st_err_missing);
     
     crm_debug_4("Waiting for msg on command channel");
     
     reg_msg = xmlfromIPC(ch, MAX_IPC_DELAY);
     
     if(ch->ops->get_chan_status(ch) != IPC_CONNECT) {
 	crm_err("No reply message - disconnected");
 	free_xml(reg_msg);
 	return st_err_connection;
 	
     } else if(reg_msg == NULL) {
 	crm_err("No reply message - empty");
 	return st_err_ipc;
     }
     
     msg_type = crm_element_value(reg_msg, F_STONITH_OPERATION);
     tmp_ticket = crm_element_value(reg_msg, F_STONITH_CLIENTID);
     
     if(safe_str_neq(msg_type, CRM_OP_REGISTER) ) {
 	crm_err("Invalid registration message: %s", msg_type);
 	rc = st_err_internal;
 	
     } else if(tmp_ticket == NULL) {
 	crm_err("No registration token provided");
 	crm_log_xml_warn(reg_msg, "Bad reply")
 	rc = st_err_internal;
 
     } else {
 	crm_debug("Obtained registration token: %s", tmp_ticket);
 	*token = crm_strdup(tmp_ticket);
     }
 
     free_xml(reg_msg);
     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);
+    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_debug_4("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(LOG_ERR, "op", op_msg);
 	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");
 	
     /* close channels */
     if (native->command_channel != NULL) {
 	native->command_channel->ops->destroy(
 	    native->command_channel);
 	native->command_channel = NULL;
     }
 
     if (native->callback_source != NULL) {
 	G_main_del_IPC_Channel(native->callback_source);
 	native->callback_source = NULL;
     }
 
     if (native->callback_channel != NULL) {
 #ifdef BUG
 	native->callback_channel->ops->destroy(
 	    native->callback_channel);
 #endif
 	native->callback_channel = NULL;
     }
 
     stonith->state = stonith_disconnected;
     return stonith_ok;
 }
 
 static int stonith_api_signon(
     stonith_t* stonith, const char *name, int *async_fd, int *sync_fd)
 {
     int rc = stonith_ok;
     xmlNode *hello = NULL;
     char *uuid_ticket = NULL;
     stonith_private_t *native = stonith->private;
 	
     crm_debug_4("Connecting command channel");
 
     stonith->state = stonith_connected_command;
     native->command_channel = init_client_ipc_comms_nodispatch(stonith_channel);
 	
     if(native->command_channel == NULL) {
 	crm_debug("Connection to command channel failed");
 	rc = st_err_connection;
 		
     } else if(native->command_channel->ch_status != IPC_CONNECT) {
 	crm_err("Connection may have succeeded,"
 		" but authentication to command channel failed");
 	rc = st_err_authentication;
     }
 
     if(rc == stonith_ok) {
 	rc = get_stonith_token(native->command_channel, &uuid_ticket);
 	if(rc == stonith_ok) {
 	    native->token = uuid_ticket;
 	    uuid_ticket = NULL;
 
 	} else {
 	    stonith->state = stonith_disconnected;
 	    native->command_channel->ops->disconnect(native->command_channel);
 	    return rc;
 	}
     }
 
     native->callback_channel = init_client_ipc_comms_nodispatch(
 	stonith_channel_callback);
     
     if(native->callback_channel == NULL) {
 	crm_debug("Connection to callback channel failed");
 	rc = st_err_connection;
 		
     } else if(native->callback_channel->ch_status != IPC_CONNECT) {
 	crm_err("Connection may have succeeded,"
 		" but authentication to command channel failed");
 	rc = st_err_authentication;
     }
 	
     if(rc == stonith_ok) {
 	native->callback_channel->send_queue->max_qlen = 500;
 	rc = get_stonith_token(native->callback_channel, &uuid_ticket);
 	if(rc == stonith_ok) {
 	    crm_free(native->token);
 	    native->token = uuid_ticket;
 	}
     }
 	
     if(rc == stonith_ok) {
 	CRM_CHECK(native->token != NULL, ;);
 	hello = stonith_create_op(0, native->token, CRM_OP_REGISTER, NULL, 0);
 	crm_xml_add(hello, F_STONITH_CLIENTNAME, name);
 	    
 	if(send_ipc_message(native->command_channel, hello) == FALSE) {
 	    rc = st_err_internal;
 	}
 
 	free_xml(hello);
     }
 	
     if(rc == stonith_ok) {
 	gboolean do_mainloop = TRUE;
 	if(async_fd != NULL) {
 	    do_mainloop = FALSE;
 	    *async_fd = native->callback_channel->ops->get_recv_select_fd(native->callback_channel);
 	}
 
 	if(sync_fd != NULL) {
 	    do_mainloop = FALSE;
 	    *sync_fd = native->callback_channel->ops->get_send_select_fd(native->callback_channel);
 	}
 
 	if(do_mainloop) {
 	    crm_debug_4("Connecting callback channel");
 	    native->callback_source = G_main_add_IPC_Channel(
 		G_PRIORITY_HIGH, native->callback_channel, FALSE, stonith_dispatch,
 		stonith, default_ipc_connection_destroy);
 		
 	    if(native->callback_source == NULL) {
 		crm_err("Callback source not recorded");
 		rc = st_err_connection;
 
 	    } else {
 		set_IPC_Channel_dnotify(
 		    native->callback_source, stonith_connection_destroy);
 	    }
 	}
     } 
 
     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) {
 	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);
 	}	
 	send_ipc_message(native->callback_channel, notify_msg);
     }
 
     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;
 
     crm_debug_2("Adding callback for %s events (%d)",
 		event, g_list_length(stonith->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(
 	stonith->notify_list, new_client, stonithlib_GCompareFunc);
 	
     if(list_item != NULL) {
 	crm_warn("Callback already present");
 	crm_free(new_client);
 	return st_err_exists;
 		
     } else {
 	stonith->notify_list = g_list_append(
 	    stonith->notify_list, new_client);
 
 	stonith_set_notification(stonith, event, 1);
 		
 	crm_debug_3("Callback added (%d)", g_list_length(stonith->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;
 
     crm_debug("Removing callback for %s events", event);
 
     crm_malloc0(new_client, sizeof(stonith_notify_client_t));
     new_client->event = event;
     new_client->notify = NULL;
 
     list_item = g_list_find_custom(
 	stonith->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;
 	stonith->notify_list =
 	    g_list_remove(stonith->notify_list, list_client);
 	crm_free(list_client);
 
 	crm_debug_3("Removed callback");
 
     } else {
 	crm_debug_3("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 %ds", 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, gboolean 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;
     CRM_CHECK(stonith != NULL, return st_err_missing);
     CRM_CHECK(stonith->private != NULL, return st_err_missing);
 
     if(call_id == 0) {
 	stonith_private_t *private = stonith->private;
 	private->op_callback = callback;
 
     } else if(call_id < 0) {
 	if(only_success == FALSE) {
 	    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*1000;
 	async_timer->ref = g_timeout_add(
 	    async_timer->timeout, stonith_async_timeout_handler, async_timer);
     }
 	
     g_hash_table_insert(stonith_op_callback_table, GINT_TO_POINTER(call_id), blob);
 	
     return TRUE;
 }
 
 static int stonith_api_del_callback(stonith_t *stonith, int call_id, gboolean all_callbacks) 
 {
     stonith_private_t *private = stonith->private;
     
     if(all_callbacks) {
 	private->op_callback = NULL;
 	if(stonith_op_callback_table != NULL) {
 	    g_hash_table_destroy(stonith_op_callback_table);
 	}
 
 	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(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(void)
 {
     if(stonith_op_callback_table == NULL) {
 	return;
     }
     return g_hash_table_foreach(
 	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);
     }
 
     blob = g_hash_table_lookup(
 	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_debug_2("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_debug_2("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(LOG_DEBUG, "Failed STONITH Update", msg);
     }
 	
     if(private->op_callback != NULL) {
 	crm_debug_2("Invoking global callback for call %d", call_id);
 	private->op_callback(stonith, msg, call_id, rc, output, NULL);
     }
     crm_debug_4("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_debug_4("Skipping callback - event mismatch %p/%s vs. %s",
 		    entry, entry->event, event);
 	return;
     }
 	
     crm_debug_4("Invoking callback for %p/%s event...", entry, event);
     entry->notify(blob->stonith, event, blob->xml);
     crm_debug_4("Callback invoked...");
 }
 
 int stonith_send_command(
     stonith_t *stonith, const char *op, xmlNode *data, xmlNode **output_data,
     int call_options, int timeout) 
 {
     int  rc = HA_OK;
 	
     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_debug_3("Sending %s message to STONITH service", op);
     if(send_ipc_message(native->command_channel, op_msg) == FALSE) {
 	crm_err("Sending message to STONITH service FAILED");
 	free_xml(op_msg);
 	return st_err_ipc;
 
     } else {
 	crm_debug_3("Message sent");
     }
 
     free_xml(op_msg);
 
     if((call_options & stonith_discard_reply)) {
 	crm_debug_3("Discarding reply");
 	return stonith_ok;
 
     } else if(!(call_options & stonith_sync_call)) {
 	crm_debug_3("Async call, returning");
 	CRM_CHECK(stonith->call_id != 0, return st_err_ipc);
 
 	return stonith->call_id;
     }
 	
     rc = IPC_OK;
     crm_debug_3("Waiting for a syncronous reply");
 
     rc = stonith_ok;
     while(IPC_ISRCONN(native->command_channel)) {
 	int reply_id = -1;
 	int msg_id = stonith->call_id;
 
 	op_reply = xmlfromIPC(native->command_channel, stonith->call_timeout);
 	if(op_reply == NULL) {
 	    rc = st_err_peer;
 	    break;
 	}
 
 	crm_element_value_int(op_reply, F_STONITH_CALLID, &reply_id);
 	if(reply_id <= 0) {
 	    rc = st_err_peer;
 	    break;
 
 	} else if(reply_id == msg_id) {
 	    crm_debug_3("Syncronous reply received");
 	    crm_log_xml(LOG_INFO, "Reply", op_reply);
 	    if(crm_element_value_int(op_reply, F_STONITH_RC, &rc) != 0) {
 		rc = st_err_peer;
 	    }
 		    
 	    if(output_data != NULL && is_not_set(call_options, stonith_discard_reply)) {
 		*output_data = op_reply;
 		op_reply = NULL;
 	    }
 
 	    break;
 			
 	} else if(reply_id < msg_id) {
 	    crm_debug("Recieved old reply: %d (wanted %d)", reply_id, msg_id);
 	    crm_log_xml(LOG_MSG, "Old reply", op_reply);
 
 	} else if((reply_id - 10000) > msg_id) {
 	    /* wrap-around case */
 	    crm_debug("Recieved old reply: %d (wanted %d)", reply_id, msg_id);
 	    crm_log_xml(LOG_MSG, "Old reply", op_reply);
 
 	} else {
 	    crm_err("Received a __future__ reply:"
 		    " %d (wanted %d)", reply_id, msg_id);
 	}
 	free_xml(op_reply);
 	op_reply = NULL;
     }
 	
     if(IPC_ISRCONN(native->command_channel) == FALSE) {
 	crm_err("STONITH disconnected: %d", native->command_channel->ch_status);
 	stonith->state = stonith_disconnected;
     }
 
     if(op_reply == NULL && stonith->state == stonith_disconnected) {
 	rc = st_err_connection;
 
     } else if(rc == stonith_ok && op_reply == NULL) {
 	rc = st_err_peer;
     }
 	
     free_xml(op_reply);
     return rc;
 }
 
 static gboolean stonith_msgready(stonith_t* stonith)
 {
     stonith_private_t *private = NULL;
 	
     if (stonith == NULL) {
 	crm_err("No STONITH!");
 	return FALSE;
     }
 
     private = stonith->private;
 
     if(private->command_channel != NULL) {
 	/* drain the channel */
 	IPC_Channel *cmd_ch = private->command_channel;
 	xmlNode *cmd_msg = NULL;
 	while(cmd_ch->ch_status != IPC_DISCONNECT
 	      && cmd_ch->ops->is_message_pending(cmd_ch)) {
 	    /* this will happen when the STONITH exited from beneath us */
 	    cmd_msg = xmlfromIPC(cmd_ch, MAX_IPC_DELAY);
 	    free_xml(cmd_msg);
 	}
 
     } else {
 	crm_err("No command channel");
     }	
 
     if(private->callback_channel == NULL) {
 	crm_err("No callback channel");
 	return FALSE;
 
     } else if(private->callback_channel->ch_status == IPC_DISCONNECT) {
 	crm_info("Lost connection to the STONITH service [%d].",
 		 private->callback_channel->farside_pid);
 	return FALSE;
 
     } else if(private->callback_channel->ops->is_message_pending(
 		  private->callback_channel)) {
 	crm_debug_4("Message pending on command channel [%d]",
 		    private->callback_channel->farside_pid);
 	return TRUE;
     }
 
     crm_debug_3("No message pending");
     return FALSE;
 }
 
 static int stonith_rcvmsg(stonith_t* stonith)
 {
     const char *type = NULL;
     stonith_private_t *private = NULL;
     struct notify_blob_s blob;
 	
     if (stonith == NULL) {
 	crm_err("No STONITH!");
 	return FALSE;
     }
 
     blob.stonith = stonith;
     private = stonith->private;
 	
     /* if it is not blocking mode and no message in the channel, return */
     if (stonith_msgready(stonith) == FALSE) {
 	crm_debug_3("No message ready and non-blocking...");
 	return 0;
     }
 
     /* IPC_INTR is not a factor here */
     blob.xml = xmlfromIPC(private->callback_channel, MAX_IPC_DELAY);
     if (blob.xml == NULL) {
 	crm_warn("Received a NULL msg from STONITH service.");
 	return 0;
     }
 
     /* do callbacks */
     type = crm_element_value(blob.xml, F_TYPE);
     crm_debug_4("Activating %s callbacks...", type);
 
     if(safe_str_eq(type, T_STONITH_NG)) {
 	stonith_perform_callback(stonith, blob.xml, 0, 0);
 		
     } else if(safe_str_eq(type, T_STONITH_NOTIFY)) {
 	g_list_foreach(stonith->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;
 }
 
 gboolean stonith_dispatch(IPC_Channel *channel, gpointer user_data)
 {
     stonith_t *stonith = user_data;
     stonith_private_t *private = NULL;
     gboolean stay_connected = TRUE;
     
     CRM_CHECK(stonith != NULL, return FALSE);
     
     private = stonith->private;
     CRM_CHECK(private->callback_channel == channel, return FALSE);
     
     while(stonith_msgready(stonith)) {
 	/* invoke the callbacks but dont block */
 	int rc = stonith_rcvmsg(stonith);
 	if( rc < 0) {
 	    crm_err("Message acquisition failed: %d", rc);
 	    break;
 
 	} else if(rc == 0) {
 	    break;
 	}
     }
     
     if(private->callback_channel
        && private->callback_channel->ch_status != IPC_CONNECT) {
 	crm_crit("Lost connection to the STONITH service [%d/callback].",
 		 channel->farside_pid);
 	private->callback_source = NULL;
 	stay_connected = FALSE;
     }
     
     if(private->command_channel
        && private->command_channel->ch_status != IPC_CONNECT) {
 	crm_crit("Lost connection to the STONITH service [%d/command].",
 		 channel->farside_pid);
 	private->callback_source = NULL;
 	stay_connected = FALSE;
     }
 
     return stay_connected;
 }
 
 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;
 	crm_free(private->token);
 	crm_free(stonith->private);
 	crm_free(stonith->cmds);
 	crm_free(stonith);
     }
 	
     return rc;
 }
 
 void stonith_api_delete(stonith_t *stonith)
 {
     GList *list = stonith->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);
     }
 	
     g_hash_table_destroy(stonith_op_callback_table);
     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;
     
     if(stonith_op_callback_table != NULL) {
 	g_hash_table_destroy(stonith_op_callback_table);
 	stonith_op_callback_table = NULL;
     }
     if(stonith_op_callback_table == NULL) {
 	stonith_op_callback_table = g_hash_table_new_full(
 	    g_direct_hash, g_direct_equal,
 	    NULL, stonith_destroy_op_callback);
     }
 
     new_stonith->call_id = 1;
     new_stonith->notify_list = NULL;
     new_stonith->state = stonith_disconnected;
     
     crm_malloc0(new_stonith->cmds, sizeof(stonith_api_operations_t));
 
     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->unfence    = stonith_api_unfence;
     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_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;
 
     return new_stonith;
 }