diff --git a/tools/crm_mon.c b/tools/crm_mon.c
index da52c70ce5..fd74f6cb88 100644
--- a/tools/crm_mon.c
+++ b/tools/crm_mon.c
@@ -1,1785 +1,1785 @@
 
 /* 
  * Copyright (C) 2004 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 <crm/crm.h>
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <sys/utsname.h>
 
 #include <crm/msg_xml.h>
 #include <crm/common/util.h>
 #include <crm/common/xml.h>
 #include <crm/common/ipc.h>
 #include <crm/common/mainloop.h>
 
 #include <crm/cib.h>
 #include <crm/pengine/status.h>
 #include <../lib/pengine/unpack.h>
 
 /* GMainLoop *mainloop = NULL; */
 
 void wait_for_refresh(int offset, const char *prefix, int msec);
 void clean_up(int rc);
 void crm_diff_update(const char *event, xmlNode *msg);
 gboolean mon_refresh_display(gpointer user_data);
 int cib_connect(gboolean full);
 
 char *xml_file = NULL;
 char *as_html_file = NULL;
 char *pid_file = NULL;
 char *snmp_target = NULL;
 
 gboolean as_console = TRUE;;
 gboolean simple_status = FALSE;
 gboolean group_by_node = FALSE;
 gboolean inactive_resources = FALSE;
 gboolean web_cgi = FALSE;
 int reconnect_msec = 5000;
 gboolean daemonize = FALSE;
 GMainLoop *mainloop = NULL;
 guint timer_id = 0;
 
 const char *crm_mail_host = NULL;
 const char *crm_mail_prefix = NULL;
 const char *crm_mail_from = NULL;
 const char *crm_mail_to = NULL;
 const char *external_agent = NULL;
 const char *external_recipient = NULL;
 
 cib_t *cib = NULL;
 xmlNode *current_cib = NULL;
 
 gboolean one_shot = FALSE;
 gboolean has_warnings = FALSE;
 gboolean print_failcount = FALSE;
 gboolean print_operations = FALSE;
 gboolean print_timing = FALSE;
 
 gboolean log_diffs = FALSE;
 gboolean log_updates = FALSE;
 
 long last_refresh = 0;
 crm_trigger_t *refresh_trigger = NULL;
 
 /*
  * 1.3.6.1.4.1.32723 has been assigned to the project by IANA
  * http://www.iana.org/assignments/enterprise-numbers
  */
 #define PACEMAKER_PREFIX "1.3.6.1.4.1.32723"
 #define PACEMAKER_TRAP_PREFIX PACEMAKER_PREFIX ".1"
 
 #define snmp_crm_trap_oid   PACEMAKER_TRAP_PREFIX
 #define snmp_crm_oid_node   PACEMAKER_TRAP_PREFIX ".1"
 #define snmp_crm_oid_rsc    PACEMAKER_TRAP_PREFIX ".2"
 #define snmp_crm_oid_task   PACEMAKER_TRAP_PREFIX ".3"
 #define snmp_crm_oid_desc   PACEMAKER_TRAP_PREFIX ".4"
 #define snmp_crm_oid_status PACEMAKER_TRAP_PREFIX ".5"
 #define snmp_crm_oid_rc     PACEMAKER_TRAP_PREFIX ".6"
 #define snmp_crm_oid_trc    PACEMAKER_TRAP_PREFIX ".7"
 
 #if CURSES_ENABLED
 #  define print_dot() if(as_console) {			\
 	printw(".");					\
 	clrtoeol();					\
 	refresh();					\
     } else {						\
 	fprintf(stdout, ".");				\
     }
 #else
 #  define print_dot() fprintf(stdout, ".");
 #endif
 
 #if CURSES_ENABLED
 #  define print_as(fmt, args...) if(as_console) {	\
 	printw(fmt, ##args);				\
 	clrtoeol();					\
 	refresh();					\
     } else {						\
 	fprintf(stdout, fmt, ##args);		\
     }
 #else
 #  define print_as(fmt, args...) fprintf(stdout, fmt, ##args);
 #endif
 
 static void
 blank_screen(void) 
 {
 #if CURSES_ENABLED
     int lpc = 0;
     for(lpc = 0; lpc < LINES; lpc++) {
 	move(lpc, 0);
 	clrtoeol();
     }
     move(0, 0);
     refresh();
 #endif
 }
 
 static gboolean
 mon_timer_popped(gpointer data)
 {
     int rc = cib_ok;
     if(timer_id > 0) {
 	g_source_remove(timer_id);
     }
 
     rc = cib_connect(TRUE);
     
     if(rc != cib_ok) {
 	print_dot();
 	timer_id = g_timeout_add(reconnect_msec, mon_timer_popped, NULL);
     }
     return FALSE;
 }
 
 static void mon_cib_connection_destroy(gpointer user_data)
 {
     print_as("Connection to the CIB terminated\n");
     if(cib) {
 	print_as("Reconnecting...");
 	cib->cmds->signoff(cib);
 	timer_id = g_timeout_add(reconnect_msec, mon_timer_popped, NULL);
     }
     return;
 }
 
 /*
  * Mainloop signal handler.
  */
 static void
 mon_shutdown(int nsig)
 {
     clean_up(LSB_EXIT_OK);
 }
 
 int cib_connect(gboolean full) 
 {
     int rc = cib_ok;
     static gboolean need_pass = TRUE;
     CRM_CHECK(cib != NULL, return cib_missing);
 
     if(getenv("CIB_passwd") != NULL) {
 	need_pass = FALSE;
     }
     
     if(cib->state != cib_connected_query
        && cib->state != cib_connected_command) {
 	crm_debug_4("Connecting to the CIB");		
 	if(as_console && need_pass && cib->variant == cib_remote) {
 	    need_pass = FALSE;
 	    print_as("Password:");
 	}
 
 	rc = cib->cmds->signon(cib, crm_system_name, cib_query);
 
 	if(rc != cib_ok) {
 	    return rc;
 	}
 
 	current_cib = get_cib_copy(cib);
 	mon_refresh_display(NULL);
 	
 	if(full) {
 	    if(rc == cib_ok) {
 		rc = cib->cmds->set_connection_dnotify(cib, mon_cib_connection_destroy);
 		if(rc == cib_NOTSUPPORTED) {
 		    print_as("Notification setup failed, won't be able to reconnect after failure");
 		    if(as_console) { sleep(2); }
 		    rc = cib_ok;
 		}
 
 	    }
 	    
 	    if(rc == cib_ok) {
 		cib->cmds->del_notify_callback(cib, T_CIB_DIFF_NOTIFY, crm_diff_update);
 		rc = cib->cmds->add_notify_callback(cib, T_CIB_DIFF_NOTIFY, crm_diff_update);
 	    }
 	    
 	    if(rc != cib_ok) {
 		print_as("Notification setup failed, could not monitor CIB actions");
 		if(as_console) { sleep(2); }
 		clean_up(-rc);
 	    }
 	}
     }
     return rc;
 }
 
 static struct crm_option long_options[] = {
     /* Top-level Options */
     {"help",           0, 0, '?', "\tThis text"},
     {"version",        0, 0, '$', "\tVersion information"  },
     {"verbose",        0, 0, 'V', "\tIncrease debug output"},
 
     {"-spacer-",	1, 0, '-', "\nModes:"},
     {"as-html",        1, 0, 'h', "Write cluster status to the named file"},
     {"web-cgi",        0, 0, 'w', "\tWeb mode with output suitable for cgi"},
     {"simple-status",  0, 0, 's', "Display the cluster status once as a simple one line output (suitable for nagios)"},
     {"snmp-traps",     1, 0, 'S', "Send SNMP traps to this station", !ENABLE_SNMP},
     {"mail-to",        1, 0, 'T', "Send Mail alerts to this user.  See also --mail-from, --mail-host, --mail-prefix", !ENABLE_ESMTP},
     
     {"-spacer-",	1, 0, '-', "\nDisplay Options:"},
     {"group-by-node",  0, 0, 'n', "Group resources by node"     },
     {"inactive",       0, 0, 'r', "Display inactive resources"  },
     {"failcounts",     0, 0, 'f', "Display resource fail counts"},
     {"operations",     0, 0, 'o', "Display resource operation history" },
     {"timing-details", 0, 0, 't', "Display resource operation history with timing details\n" },
 
     {"-spacer-",	1, 0, '-', "\nAdditional Options:"},
     {"interval",       1, 0, 'i', "\tUpdate frequency in seconds" },
     {"one-shot",       0, 0, '1', "\tDisplay the cluster status once on the console and exit"},
     {"disable-ncurses",0, 0, 'N', "\tDisable the use of ncurses", !CURSES_ENABLED},
     {"daemonize",      0, 0, 'd', "\tRun in the background as a daemon"},
     {"pid-file",       1, 0, 'p', "\t(Advanced) Daemon pid file location"},
     {"mail-from",      1, 0, 'F', "\tMail alerts should come from the named user", !ENABLE_ESMTP},
     {"mail-host",      1, 0, 'H', "\tMail alerts should be sent via the named host", !ENABLE_ESMTP},
     {"mail-prefix",    1, 0, 'P', "Subjects for mail alerts should start with this string", !ENABLE_ESMTP},
     {"external-agent",    1, 0, 'E', "A program to run when resource operations take place."},
     {"external-recipient",1, 0, 'e', "A recipient for your program (assuming you want the program to send something to someone)."},
 
     
     {"xml-file",       1, 0, 'x', NULL, 1},
 
     {"-spacer-",	1, 0, '-', "\nExamples:", pcmk_option_paragraph},
     {"-spacer-",	1, 0, '-', "Display the cluster´s status on the console with updates as they occur:", pcmk_option_paragraph},
     {"-spacer-",	1, 0, '-', " crm_mon", pcmk_option_example},
     {"-spacer-",	1, 0, '-', "Display the cluster´s status on the console just once then exit:", pcmk_option_paragraph},
     {"-spacer-",	1, 0, '-', " crm_mon -1", pcmk_option_example},
     {"-spacer-",	1, 0, '-', "Display your cluster´s status, group resources by node, and include inactive resources in the list:", pcmk_option_paragraph},
     {"-spacer-",	1, 0, '-', " crm_mon --group-by-node --inactive", pcmk_option_example},
     {"-spacer-",	1, 0, '-', "Start crm_mon as a background daemon and have it write the cluster´s status to an HTML file:", pcmk_option_paragraph},
     {"-spacer-",	1, 0, '-', " crm_mon --daemonize --as-html /path/to/docroot/filename.html", pcmk_option_example},
     {"-spacer-",	1, 0, '-', "Start crm_mon as a background daemon and have it send email alerts:", pcmk_option_paragraph|!ENABLE_ESMTP},
     {"-spacer-",	1, 0, '-', " crm_mon --daemonize --mail-to user@example.com --mail-host mail.example.com", pcmk_option_example|!ENABLE_ESMTP},
     {"-spacer-",	1, 0, '-', "Start crm_mon as a background daemon and have it send SNMP alerts:", pcmk_option_paragraph|!ENABLE_SNMP},
     {"-spacer-",	1, 0, '-', " crm_mon --daemonize --snmp-traps snmptrapd.example.com", pcmk_option_example|!ENABLE_SNMP},
     
     {NULL, 0, 0, 0}
 };
 
 int
 main(int argc, char **argv)
 {
     int flag;
     int argerr = 0;
     int exit_code = 0;
 
     int option_index = 0;	
 
     pid_file = crm_strdup("/tmp/ClusterMon.pid");
     crm_log_init(basename(argv[0]), LOG_CRIT, FALSE, FALSE, 0, NULL);
 
     crm_set_options("V?$i:nrh:dp:s1wx:oftNS:T:F:H:P:E:e:", "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");
     
     if (strcmp(crm_system_name, "crm_mon.cgi")==0) {
 	web_cgi = TRUE;
 	one_shot = TRUE;
     }
 
     while (1) {
 	flag = crm_get_option(argc, argv, &option_index);
 	if (flag == -1)
 	    break;
 
 	switch(flag) {
 	    case 'V':
 		cl_log_enable_stderr(TRUE);
 		alter_debug(DEBUG_INC);
 		break;
 	    case 'i':
 		reconnect_msec = crm_get_msec(optarg);
 		break;
 	    case 'n':
 		group_by_node = TRUE;
 		break;
 	    case 'r':
 		inactive_resources = TRUE;
 		break;
 	    case 'd':
 		daemonize = TRUE;
 		break;
 	    case 't':
 		print_timing = TRUE;
 		print_operations = TRUE;
 		break;
 	    case 'o':
 		print_operations = TRUE;
 		break;
 	    case 'f':
 		print_failcount = TRUE;
 		break;
 	    case 'p':
 		crm_free(pid_file);
 		pid_file = crm_strdup(optarg);
 		break;
 	    case 'x':
 		xml_file = crm_strdup(optarg);
 		one_shot = TRUE;
 		break;
 	    case 'h':
 		as_html_file = crm_strdup(optarg);
 		break;
 	    case 'w':
 		web_cgi = TRUE;
 		one_shot = TRUE;
 		break;
 	    case 's':
 		simple_status = TRUE;
 		one_shot = TRUE;
 		break;
 	    case 'S':
 		snmp_target = optarg;
 		break;
 	    case 'T':
 		crm_mail_to = optarg;
 		break;
 	    case 'F':
 		crm_mail_from = optarg;
 		break;
 	    case 'H':
 		crm_mail_host = optarg;
 		break;
 	    case 'P':
 		crm_mail_prefix = optarg;
 		break;
 	    case 'E':
 		external_agent = optarg;
 		break;
 	    case 'e':
 		external_recipient = optarg;
 		break;
 	    case '1':
 		one_shot = TRUE;
 		break;
 	    case 'N':
 		as_console = FALSE;
 		break;
 	    case '$':
 	    case '?':
 		crm_help(flag, LSB_EXIT_OK);
 		break;
 	    default:
 		printf("Argument code 0%o (%c) is not (?yet?) supported\n", flag, flag);
 		++argerr;
 		break;
 	}
     }
 
     if (optind < argc) {
 	printf("non-option ARGV-elements: ");
 	while (optind < argc)
 	    printf("%s ", argv[optind++]);
 	printf("\n");
     }
     if (argerr) {
 	crm_help('?', LSB_EXIT_GENERIC);
     }
     
     if(one_shot) {
 	as_console = FALSE;
 
     } else if(daemonize) {
 	as_console = FALSE;
 	cl_log_enable_stderr(FALSE);
 	
 	if(!as_html_file && !snmp_target && !crm_mail_to && !external_agent) {
 	    printf("Looks like you forgot to specify one or more of: --as-html, --mail-to, --snmp-target, --external-agent\n");
 	    crm_help('?', LSB_EXIT_GENERIC);
 	}
 
 	crm_make_daemon(crm_system_name, TRUE, pid_file);
 
     } else if(as_console) {
 #if CURSES_ENABLED
 	initscr();
 	cbreak();
 	noecho();
 	cl_log_enable_stderr(FALSE);
 #else
 	one_shot = TRUE;
 	as_console = FALSE;
 	printf("Defaulting to one-shot mode\n");
 	printf("You need to have curses available at compile time to enable console mode\n");
 #endif
     }
 
     crm_info("Starting %s", crm_system_name);
     if(xml_file != NULL) {
 	current_cib = filename2xml(xml_file);
 	mon_refresh_display(NULL);
 	return exit_code;
     }
     
     if(current_cib == NULL) {
 	cib = cib_new();
 	if(!one_shot) {
 	    print_as("Attempting connection to the cluster...");
 	}
 	
 	do {
 	    exit_code = cib_connect(!one_shot);
 
 	    if(one_shot) {
 		break;
 
 	    } else if(exit_code != cib_ok) {
 		print_dot();
 		sleep(reconnect_msec/1000);
 	    }
 	    
 	} while(exit_code == cib_connection);
 	    
 	if(exit_code != cib_ok) {
 	    print_as("\nConnection to cluster failed: %s\n", cib_error2string(exit_code));
 	    if(as_console) { sleep(2); }
 	    clean_up(-exit_code);
 	}
     }
 
     if(one_shot) {
 	return exit_code;
     }
 
     mainloop = g_main_new(FALSE);
 
     mainloop_add_signal(SIGTERM, mon_shutdown);
     mainloop_add_signal(SIGINT, mon_shutdown);
     refresh_trigger = mainloop_add_trigger(G_PRIORITY_LOW, mon_refresh_display, NULL);
 	
     g_main_run(mainloop);
     g_main_destroy(mainloop);
 	
     crm_info("Exiting %s", crm_system_name);	
 
     clean_up(0);
     return 0; /* never reached */
 }
 
 void
 wait_for_refresh(int offset, const char *prefix, int msec) 
 {
     int lpc = msec / 1000;
     struct timespec sleept = {1 , 0};
 
     if(as_console == FALSE) {
 	timer_id = g_timeout_add(msec, mon_timer_popped, NULL);
 	return;
     }
 	
     crm_notice("%sRefresh in %ds...", prefix?prefix:"", lpc);
     while(lpc > 0) {
 #if CURSES_ENABLED
 	move(offset, 0);
 /* 		printw("%sRefresh in \033[01;32m%ds\033[00m...", prefix?prefix:"", lpc); */
 	printw("%sRefresh in %ds...\n", prefix?prefix:"", lpc);
 	clrtoeol();
 	refresh();
 #endif
 	lpc--;
 	if(lpc == 0) {
 	    timer_id = g_timeout_add(
 		1000, mon_timer_popped, NULL);
 	} else {
 	    if (nanosleep(&sleept, NULL) != 0) {
 		return;
 	    }
 	}
     }
 }
 
 #define mon_warn(fmt...) do {			\
 	if (!has_warnings) {			\
 	    print_as("Warning:");		\
 	} else {				\
 	    print_as(",");			\
 	}					\
 	print_as(fmt);				\
 	has_warnings = TRUE;			\
     } while(0)
 
 static int
 print_simple_status(pe_working_set_t *data_set) 
 {
     node_t *dc = NULL;
     int nodes_online = 0;
     int nodes_standby = 0;
 
     dc = data_set->dc_node;
 
     if(dc == NULL) {
 	mon_warn("No DC ");
     }
 
     slist_iter(node, node_t, data_set->nodes, lpc2,
 	       if(node->details->standby && node->details->online) {
 		   nodes_standby++;
 	       } else if(node->details->online) {
 		   nodes_online++;
 	       } else {
 		   mon_warn("offline node: %s", node->details->uname);
 	       }
 	);
 	
     if (!has_warnings) {
 	print_as("Ok: %d nodes online", nodes_online);
 	if (nodes_standby > 0) {
 	    print_as(", %d standby nodes", nodes_standby);
 	}
 	print_as(", %d resources configured",
 		 g_list_length(data_set->resources));
     }
 	
     print_as("\n");
     return 0;
 }
 
 extern int get_failcount(node_t *node, resource_t *rsc, int *last_failure, pe_working_set_t *data_set);
 
 static void get_ping_score(node_t *node, pe_working_set_t *data_set) 
 {
     const char *attr = "pingd";
     const char *value = NULL;
     value = g_hash_table_lookup(node->details->attrs, attr);
     
     if(value != NULL) {
 	print_as(" %s=%s", attr, value);
     }
 }
 
 static void print_date(time_t time) 
 {
     int lpc = 0;
     char date_str[26];
     asctime_r(localtime(&time), date_str);
     for(; lpc < 26; lpc++) {
 	if(date_str[lpc] == '\n') {
 	    date_str[lpc] = 0;
 	}
     }
     print_as("'%s'", date_str);
 }
 
 static void print_rsc_summary(pe_working_set_t *data_set, node_t *node, resource_t *rsc, gboolean all)
 {
     gboolean printed = FALSE;
     time_t last_failure = 0;
     int failcount = get_failcount(node, rsc, (int*)&last_failure, data_set);	
 
     if(all || failcount || last_failure > 0) {
 	printed = TRUE;
 	print_as("   %s: migration-threshold=%d",
 		 rsc->id, rsc->migration_threshold);
     }
     
     if(failcount > 0) {
 	printed = TRUE;
 	print_as(" fail-count=%d", failcount);
     }
     
     if(last_failure > 0) {
 	printed = TRUE;
 	print_as(" last-failure=");
 	print_date(last_failure);
     }
 
     if(printed) {
 	print_as("\n");
     }
 }
 
 
 static void print_rsc_history(pe_working_set_t *data_set, node_t *node, xmlNode *rsc_entry)
 {
     GListPtr op_list = NULL;
     gboolean print_name = TRUE;
     GListPtr sorted_op_list = NULL;
     const char *rsc_id = crm_element_value(rsc_entry, XML_ATTR_ID);
     resource_t *rsc = pe_find_resource(data_set->resources, rsc_id);
 
     xml_child_iter_filter(
 	rsc_entry, rsc_op, XML_LRM_TAG_RSC_OP,
 	op_list = g_list_append(op_list, rsc_op);
 	);
     
     sorted_op_list = g_list_sort(op_list, sort_op_by_callid);
     
     slist_iter(xml_op, xmlNode, sorted_op_list, lpc,
 	       const char *value = NULL;
 	       const char *call = crm_element_value(xml_op, XML_LRM_ATTR_CALLID);
 	       const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
 	       const char *op_rc = crm_element_value(xml_op, XML_LRM_ATTR_RC);
 	       const char *interval = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
 	       int rc = crm_parse_int(op_rc, "0");
 	       
 	       if(safe_str_eq(task, CRMD_ACTION_STATUS)
 		  && safe_str_eq(interval, "0")) {
 		   task = "probe";
 	       }
 	       
 	       if(rc == 7 && safe_str_eq(task, "probe")) {
 		   continue;
 		   
 	       } else if(safe_str_eq(task, CRMD_ACTION_NOTIFY)) {
 		   continue;
 	       }
 	       
 	       if(print_name) {
 		   print_name = FALSE;
 		   if(rsc == NULL) {
 		       print_as("Orphan resource: %s", rsc_id);
 		   } else {
 		       print_rsc_summary(data_set, node, rsc, TRUE);
 		   }
 	       }
 	       
 	       print_as("    + (%s) %s:", call, task);
 	       if(safe_str_neq(interval, "0")) {
 		   print_as(" interval=%sms", interval);
 	       }
 
 	       if(print_timing) {
 		   int int_value;
 		   const char *attr = "last-rc-change";
 		   value = crm_element_value(xml_op, attr);
 		   if(value) {
 		       int_value = crm_parse_int(value, NULL);
 		       print_as(" %s=", attr);
 		       print_date(int_value);
 		   }
 
 		   attr = "last-run";
 		   value = crm_element_value(xml_op, attr);
 		   if(value) {
 		       int_value = crm_parse_int(value, NULL);
 		       print_as(" %s=", attr);
 		       print_date(int_value);
 		   }
 		   
 		   attr = "exec-time";
 		   value = crm_element_value(xml_op, attr);
 		   if(value) {
 		       int_value = crm_parse_int(value, NULL);
 		       print_as(" %s=%dms", attr, int_value);
 		   }
 		   
 		   attr = "queue-time";
 		   value = crm_element_value(xml_op, attr);
 		   if(value) {
 		       int_value = crm_parse_int(value, NULL);
 		       print_as(" %s=%dms", attr, int_value);
 		   }
 	       }
 	       
 	       print_as(" rc=%s (%s)\n", op_rc, execra_code2string(rc));
 	       
 	);
     
     /* no need to free the contents */
     g_list_free(sorted_op_list);
 }
 
 static void print_node_summary(pe_working_set_t *data_set, gboolean operations)
 {
     xmlNode *lrm_rsc = NULL;
     xmlNode *cib_status = get_object_root(XML_CIB_TAG_STATUS, data_set->input);
 
     if(operations) {
 	print_as("\nOperations:\n");
     } else {
 	print_as("\nMigration summary:\n");
     }
     
     xml_child_iter_filter(
 	cib_status, node_state, XML_CIB_TAG_STATE,
 	node_t *node = pe_find_node_id(data_set->nodes, ID(node_state));
 	if(node == NULL || node->details->online == FALSE){
 	    continue;
 	}
 	
 	print_as("* Node %s: ", crm_element_value(node_state, XML_ATTR_UNAME));
 	get_ping_score(node, data_set); 
 	print_as("\n");
 	
 	lrm_rsc = find_xml_node(node_state, XML_CIB_TAG_LRM, FALSE);
 	lrm_rsc = find_xml_node(lrm_rsc, XML_LRM_TAG_RESOURCES, FALSE);
 	
 	xml_child_iter_filter(
 	    lrm_rsc, rsc_entry, XML_LRM_TAG_RESOURCE,
 
 	    if(operations) {
 		print_rsc_history(data_set, node, rsc_entry);
 
 	    } else {
 		const char *rsc_id = crm_element_value(rsc_entry, XML_ATTR_ID);
 		resource_t *rsc = pe_find_resource(data_set->resources, rsc_id);
 		if(rsc) {
 		    print_rsc_summary(data_set, node, rsc, FALSE);
 		} else {
 		    print_as("   %s: orphan\n", rsc_id);
 		}
 	    }
 	    );
 	);
 }
 
 static char *
 add_list_element(char *list, const char *value) 
 {
     int len = 0;
     int last = 0;
 
     if(value == NULL) {
 	return list;
     }
     if(list) {
 	last = strlen(list);
     }
     len = last + 2;  /* +1 space, +1 EOS */
     len += strlen(value);
     crm_realloc(list, len);
     sprintf(list + last, " %s", value);
     return list;
 }
 
 static int
 print_status(pe_working_set_t *data_set) 
 {
     static int updates = 0;
 
     node_t *dc = NULL;
     char *since_epoch = NULL;
     char *online_nodes = NULL;
     char *offline_nodes = NULL;
     xmlNode *dc_version = NULL;
     xmlNode *quorum_node = NULL;
     xmlNode *stack = NULL;
     time_t a_time = time(NULL);
 
     int configured_resources = 0;
     int print_opts = pe_print_ncurses;
     const char *quorum_votes = "unknown";
 
     if(as_console) {
 	blank_screen();
     } else {
 	print_opts = pe_print_printf;
     }
 
     updates++;
     dc = data_set->dc_node;
 
     print_as("============\n");
 
     if(a_time == (time_t)-1) {
 	crm_perror(LOG_ERR,"set_node_tstamp(): Invalid time returned");
 	return 1;
     }
 	
     since_epoch = ctime(&a_time);
     if(since_epoch != NULL) {
 	print_as("Last updated: %s", since_epoch);
     }
 
     stack = get_xpath_object("//nvpair[@name='cluster-infrastructure']", data_set->input, LOG_DEBUG);
     if(stack) {
 	    print_as("Stack: %s\n", crm_element_value(stack, XML_NVPAIR_ATTR_VALUE));
     }    
     
     dc_version = get_xpath_object("//nvpair[@name='dc-version']", data_set->input, LOG_DEBUG);    
     if(dc == NULL) {
 	print_as("Current DC: NONE\n");
     } else {
 	const char *quorum = crm_element_value(data_set->input, XML_ATTR_HAVE_QUORUM);
 	if(safe_str_neq(dc->details->uname, dc->details->id)) {
 	    print_as("Current DC: %s (%s)",
 		     dc->details->uname, dc->details->id);
 	} else {
 	    print_as("Current DC: %s", dc->details->uname);
 	}
 	print_as(" - partition %s quorum\n", 
 		 crm_is_true(quorum)?"with":"WITHOUT");
 	if(dc_version) {
 	    print_as("Version: %s\n", crm_element_value(dc_version, XML_NVPAIR_ATTR_VALUE));
 	}
     }
 
     quorum_node = get_xpath_object("//nvpair[@name='"XML_ATTR_EXPECTED_VOTES"']", data_set->input, LOG_DEBUG);
     if(quorum_node) {
 	quorum_votes = crm_element_value(quorum_node, XML_NVPAIR_ATTR_VALUE);
     }
 
     slist_iter(rsc, resource_t, data_set->resources, lpc,
 	       if(is_not_set(rsc->flags, pe_rsc_orphan)) {
 		   configured_resources++;
 	       }
 	);
 	
     print_as("%d Nodes configured, %s expected votes\n", g_list_length(data_set->nodes), quorum_votes);
     print_as("%d Resources configured.\n", configured_resources);
     print_as("============\n\n");
 
     slist_iter(node, node_t, data_set->nodes, lpc2,
 	       const char *node_mode = NULL;
 
 	       if(node->details->unclean) {
 		   if(node->details->online && node->details->unclean) {
 		       node_mode = "UNCLEAN (online)";
 
 		   } else if(node->details->pending) {
 		       node_mode = "UNCLEAN (pending)";
 
 		   } else {
 		       node_mode = "UNCLEAN (offline)";
 		   }
 
 	       } else if(node->details->pending) {
 		   node_mode = "pending";
 
 	       } else if(node->details->standby_onfail && node->details->online) {
 		   node_mode = "standby (on-fail)";
 
 	       } else if(node->details->standby) {
 		   if(node->details->online) {
 		       node_mode = "standby";
 		   } else {
 		       node_mode = "OFFLINE (standby)";
 		   }
 		   
 	       } else if(node->details->online) {
 		   node_mode = "online";
 		   if(group_by_node == FALSE) {
 		       online_nodes = add_list_element(online_nodes, node->details->uname);
 		       continue;
 		   }
 
 	       } else {
 		   node_mode = "OFFLINE";
 		   if(group_by_node == FALSE) {
 		       offline_nodes = add_list_element(offline_nodes, node->details->uname);
 		       continue;
 		   }
 	       }
 
 	       if(safe_str_eq(node->details->uname, node->details->id)) {
 		   print_as("Node %s: %s\n",
 			node->details->uname, node_mode);
 	       } else {
 		   print_as("Node %s (%s): %s\n",
 			node->details->uname, node->details->id,
 			node_mode);
 	       }
 	       
 	       if(group_by_node) {
 		   slist_iter(rsc, resource_t,
 			      node->details->running_rsc, lpc2,
 			      rsc->fns->print(
 				  rsc, "\t", print_opts|pe_print_rsconly, stdout);
 		       );
 	       }
 	);
 
     if(online_nodes) {
 	print_as("Online: [%s ]\n", online_nodes);
 	crm_free(online_nodes);
     }
     if(offline_nodes) {
 	print_as("OFFLINE: [%s ]\n", offline_nodes);
 	crm_free(offline_nodes);
     }
     
     if(group_by_node == FALSE && inactive_resources) {
 	print_as("\nFull list of resources:\n");
 
     } else if(inactive_resources) {
 	print_as("\nInactive resources:\n");
     }
 	
     if(group_by_node == FALSE || inactive_resources) {
 	print_as("\n");
 	slist_iter(rsc, resource_t, data_set->resources, lpc2,
 		   gboolean is_active = rsc->fns->active(rsc, TRUE);
 		   gboolean partially_active = rsc->fns->active(rsc, FALSE);
 		   if(is_set(rsc->flags, pe_rsc_orphan) && is_active == FALSE) {
 		       continue;
 				   
 		   } else if(group_by_node == FALSE) {
 		       if(partially_active || inactive_resources) {
 			   rsc->fns->print(rsc, NULL, print_opts, stdout);
 		       }
 				   
 		   } else if(is_active == FALSE && inactive_resources) {
 		       rsc->fns->print(rsc, NULL, print_opts, stdout);
 		   }
 	    );
     }
 
     if(print_operations || print_failcount) {
 	print_node_summary(data_set, print_operations);
     }
 	
     if(xml_has_children(data_set->failed)) {
 	print_as("\nFailed actions:\n");
 	xml_child_iter(data_set->failed, xml_op, 
 		       int val = 0;
 		       const char *id = ID(xml_op);
 		       const char *last = crm_element_value(xml_op, "last_run");
 		       const char *node = crm_element_value(xml_op, XML_ATTR_UNAME);
 		       const char *call = crm_element_value(xml_op, XML_LRM_ATTR_CALLID);
 		       const char *rc   = crm_element_value(xml_op, XML_LRM_ATTR_RC);
 		       const char *status = crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS);
 			       
 		       val = crm_parse_int(status, "0");
 		       print_as("    %s (node=%s, call=%s, rc=%s, status=%s",
 				id, node, call, rc, op_status2text(val));
 
 		       if(last) {
 			   time_t run_at = crm_parse_int(last, "0");
 			   print_as(", last-run=%s, queued=%sms, exec=%sms\n",
 				    ctime(&run_at),
 				    crm_element_value(xml_op, "exec_time"),
 				    crm_element_value(xml_op, "queue_time"));
 		       }
 
 		       val = crm_parse_int(rc, "0");
 		       print_as("): %s\n", execra_code2string(val));
 	    );
     }
 	
 #if CURSES_ENABLED
     if(as_console) {
 	refresh();
     }
 #endif
     return 0;
 }
 
 static int
 print_html_status(pe_working_set_t *data_set, const char *filename, gboolean web_cgi) 
 {
     FILE *stream;
     node_t *dc = NULL;
     static int updates = 0;
     char *filename_tmp = NULL;
 
     if (web_cgi) {
 	stream=stdout;
 	fprintf(stream, "Content-type: text/html\n\n");
 
     } else {
 	filename_tmp = crm_concat(filename, "tmp", '.');
 	stream = fopen(filename_tmp, "w");
 	if(stream == NULL) {
 	    crm_perror(LOG_ERR,"Cannot open %s for writing", filename_tmp);
 	    crm_free(filename_tmp);
 	    return -1;
 	}	
     }
 
     updates++;
     dc = data_set->dc_node;
 
     fprintf(stream, "<html>");
     fprintf(stream, "<head>");
     fprintf(stream, "<title>Cluster status</title>");
 /* content="%d;url=http://webdesign.about.com" */
     fprintf(stream,
-	    "<meta http-equiv=\"refresh\" content=\"%d\">", reconnect_msec);
+	    "<meta http-equiv=\"refresh\" content=\"%d\">", reconnect_msec/1000);
     fprintf(stream, "</head>");
 
     /*** SUMMARY ***/
 
     fprintf(stream, "<h2>Cluster summary</h2>");
     {
 	char *now_str = NULL;
 	time_t now = time(NULL);
 	now_str = ctime(&now);
 	now_str[24] = EOS; /* replace the newline */
 	fprintf(stream, "Last updated: <b>%s</b><br/>\n", now_str);
     }
 	
     if(dc == NULL) {
 	fprintf(stream, "Current DC: <font color=\"red\"><b>NONE</b></font><br/>");
     } else {
 	fprintf(stream, "Current DC: %s (%s)<br/>",
 		dc->details->uname, dc->details->id);
     }
     fprintf(stream, "%d Nodes configured.<br/>",
 	    g_list_length(data_set->nodes));
     fprintf(stream, "%d Resources configured.<br/>",
 	    g_list_length(data_set->resources));
 
     /*** CONFIG ***/
 	
     fprintf(stream, "<h3>Config Options</h3>\n");
 
     fprintf(stream, "<table>\n");
     fprintf(stream, "<tr><td>Default resource stickiness</td><td>:</td><td>%d</td></tr>\n",
 	    data_set->default_resource_stickiness);
 	
     fprintf(stream, "<tr><td>STONITH of failed nodes</td><td>:</td><td>%s</td></tr>\n",
 	    is_set(data_set->flags, pe_flag_stonith_enabled)?"enabled":"disabled");
 
     fprintf(stream, "<tr><td>Cluster is</td><td>:</td><td>%ssymmetric</td></tr>\n",
 	    is_set(data_set->flags, pe_flag_symmetric_cluster)?"":"a-");
 	
     fprintf(stream, "<tr><td>No Quorum Policy</td><td>:</td><td>");
     switch (data_set->no_quorum_policy) {
 	case no_quorum_freeze:
 	    fprintf(stream, "Freeze resources");
 	    break;
 	case no_quorum_stop:
 	    fprintf(stream, "Stop ALL resources");
 	    break;
 	case no_quorum_ignore:
 	    fprintf(stream, "Ignore");
 	    break;
 	case no_quorum_suicide:
 	    fprintf(stream, "Suicide");
 	    break;
     }
     fprintf(stream, "\n</td></tr>\n</table>\n");
 
     /*** NODE LIST ***/
 	
     fprintf(stream, "<h2>Node List</h2>\n");
     fprintf(stream, "<ul>\n");
     slist_iter(node, node_t, data_set->nodes, lpc2,
 	       fprintf(stream, "<li>");
 	       if(node->details->standby_onfail && node->details->online) {
 		   fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"orange\">standby (on-fail)</font>\n");
 	       } else if(node->details->standby && node->details->online) {
 		   fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"orange\">standby</font>\n");
 	       } else if(node->details->standby) {
 		   fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"red\">OFFLINE (standby)</font>\n");
 	       } else if(node->details->online) {
 		   fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"green\">online</font>\n");
 	       } else {
 		   fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"red\">OFFLINE</font>\n");
 	       }
 	       if(group_by_node) {
 		   fprintf(stream, "<ul>\n");
 		   slist_iter(rsc, resource_t,
 			      node->details->running_rsc, lpc2,
 			      fprintf(stream, "<li>");
 			      rsc->fns->print(rsc, NULL,
 					      pe_print_html|pe_print_rsconly, stream);
 			      fprintf(stream, "</li>\n");
 		       );
 		   fprintf(stream, "</ul>\n");
 	       }
 	       fprintf(stream, "</li>\n");
 	);
     fprintf(stream, "</ul>\n");
 	
     if(group_by_node && inactive_resources) {
 	fprintf(stream, "<h2>(Partially) Inactive Resources</h2>\n");
 
     } else if(group_by_node == FALSE)  {
 	fprintf(stream, "<h2>Resource List</h2>\n");
     }
 	
     if(group_by_node == FALSE || inactive_resources) {
 	slist_iter(rsc, resource_t, data_set->resources, lpc2,
 		   if(group_by_node && rsc->fns->active(rsc, TRUE)) {
 		       continue;
 		   }
 		   rsc->fns->print(rsc, NULL, pe_print_html, stream);
 	    );
     }
 
     fprintf(stream, "</html>");
     fflush(stream);
     fclose(stream);
 
     if (!web_cgi) {
 	if(rename(filename_tmp, filename) != 0) {
 	    crm_perror(LOG_ERR,"Unable to rename %s->%s", filename_tmp, filename);
 	}
 	crm_free(filename_tmp);
     }
     return 0;
 }
 
 #if ENABLE_SNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/snmpv3_api.h>
 #include <net-snmp/agent/agent_trap.h>
 #include <net-snmp/library/snmp_client.h>
 #include <net-snmp/library/mib.h>
 #include <net-snmp/library/snmp_debug.h>
 
 #define add_snmp_field(list, oid_string, value) do {			\
 	oid name[MAX_OID_LEN];						\
         size_t name_length = MAX_OID_LEN;				\
 	if (snmp_parse_oid(oid_string, name, &name_length)) {		\
 	    int s_rc = snmp_add_var(list, name, name_length, 's', (value)); \
 	    if(s_rc != 0) {						\
 		crm_err("Could not add %s=%s rc=%d", oid_string, value, s_rc); \
 	    } else {							\
 		crm_debug_2("Added %s=%s", oid_string, value);		\
 	    }								\
 	} else {							\
 	    crm_err("Could not parse OID: %s", oid_string);		\
 	}								\
     } while(0)								\
 
 #define add_snmp_field_int(list, oid_string, value) do {		\
 	oid name[MAX_OID_LEN];						\
         size_t name_length = MAX_OID_LEN;				\
 	if (snmp_parse_oid(oid_string, name, &name_length)) {		\
 	    if(NULL == snmp_pdu_add_variable(				\
 		   list, name, name_length, ASN_INTEGER,		\
 		   (u_char *) & value, sizeof(value))) {		\
 		crm_err("Could not add %s=%d", oid_string, value); \
 	    } else {							\
 		crm_debug_2("Added %s=%d", oid_string, value);		\
 	    }								\
 	} else {							\
 	    crm_err("Could not parse OID: %s", oid_string);		\
 	}								\
     } while(0)								\
     
 static int snmp_input(int operation, netsnmp_session *session,
 		      int reqid, netsnmp_pdu *pdu, void *magic)
 {
     return 1;
 }
 
 static netsnmp_session *crm_snmp_init(const char *target) 
 {
     static netsnmp_session *session = NULL;
 
     if(session) {
 	return session;
     }
 
     if(target == NULL) {
 	return NULL;
     }
     
     if(crm_log_level > LOG_INFO) {
 	char *debug_tokens = crm_strdup("run:shell,snmptrap,tdomain");
 	debug_register_tokens(debug_tokens);
 	snmp_set_do_debugging(1);
     }
 
     crm_malloc0(session, sizeof(netsnmp_session));
     snmp_sess_init(session);
     session->version = SNMP_VERSION_2c;
     session->callback = snmp_input;
     session->callback_magic = NULL;
 
     session = snmp_add(session,
                   netsnmp_transport_open_client("snmptrap", target),
                   NULL, NULL);
 
     if (session == NULL) {
         snmp_sess_perror("Could not create snmp transport", session);
     }
     return session;
 }
 
 
 #endif
 
 static int
 send_snmp_trap(const char *node, const char *rsc, const char *task, int target_rc, int rc, int status, const char *desc)
 {
     int ret = 1;
 #if ENABLE_SNMP
     static oid snmptrap_oid[] = { 1,3,6,1,6,3,1,1,4,1,0 };
     static oid sysuptime_oid[] = { 1,3,6,1,2,1,1,3,0 };
 
     netsnmp_pdu *trap_pdu;
     netsnmp_session *session = crm_snmp_init(snmp_target);
 
     trap_pdu = snmp_pdu_create(SNMP_MSG_TRAP2);
     if ( !trap_pdu ) {
 	crm_err("Failed to create SNMP notification");
 	return SNMPERR_GENERR;
     }
 
     if(1) {
 	/* send uptime */
         char csysuptime[20];
 	time_t now = time(NULL);
 	sprintf(csysuptime, "%ld", now);
 	snmp_add_var(trap_pdu, sysuptime_oid, sizeof(sysuptime_oid) / sizeof(oid), 't', csysuptime);
     }
     
     /* Indicate what the trap is by setting snmpTrapOid.0 */
     ret = snmp_add_var(trap_pdu, snmptrap_oid, sizeof(snmptrap_oid) / sizeof(oid), 'o', snmp_crm_trap_oid);
     if (ret != 0) {
 	crm_err("Failed set snmpTrapOid.0=%s", snmp_crm_trap_oid);
 	return ret;
     }
 
     /* Add extries to the trap */
     add_snmp_field(trap_pdu, snmp_crm_oid_rsc,  rsc);
     add_snmp_field(trap_pdu, snmp_crm_oid_node, node);
     add_snmp_field(trap_pdu, snmp_crm_oid_task, task);
     add_snmp_field(trap_pdu, snmp_crm_oid_desc, desc);
 
     add_snmp_field_int(trap_pdu, snmp_crm_oid_rc,  rc);
     add_snmp_field_int(trap_pdu, snmp_crm_oid_trc, target_rc);
     add_snmp_field_int(trap_pdu, snmp_crm_oid_status, status);
 
     /* Send and cleanup */
     ret = snmp_send(session, trap_pdu);
     if(ret == 0) {
 	/* error */
 	snmp_sess_perror("Could not send SNMP trap", session);
 	snmp_free_pdu(trap_pdu);
 	ret = SNMPERR_GENERR;
     } else {
 	ret = SNMPERR_SUCCESS;
     }
 #else
     crm_err("Sending SNMP traps is not supported by this installation");
 #endif
     return ret;
 }
 
 #if ENABLE_ESMTP
 #include <auth-client.h>
 #include <libesmtp.h>
 
 static void print_recipient_status(
     smtp_recipient_t recipient, const char *mailbox, void *arg)
 {
     const smtp_status_t *status;
 
     status = smtp_recipient_status (recipient);
     printf ("%s: %d %s", mailbox, status->code, status->text);
 }
 
 static void event_cb (smtp_session_t session, int event_no, void *arg, ...)
 {
     int *ok;
     va_list alist;
 
     va_start(alist, arg);
     switch(event_no) {
 	case SMTP_EV_CONNECT: 
 	case SMTP_EV_MAILSTATUS:
 	case SMTP_EV_RCPTSTATUS:
 	case SMTP_EV_MESSAGEDATA:
 	case SMTP_EV_MESSAGESENT:
 	case SMTP_EV_DISCONNECT:
 	    break;
 
 	case SMTP_EV_WEAK_CIPHER: {
 	    int bits = va_arg(alist, long);
 	    ok = va_arg(alist, int*);
 	    crm_debug("SMTP_EV_WEAK_CIPHER, bits=%d - accepted.", bits);
 	    *ok = 1; break;
 	}
 	case SMTP_EV_STARTTLS_OK:
 	    crm_debug("SMTP_EV_STARTTLS_OK - TLS started here.");
 	    break;
 
 	case SMTP_EV_INVALID_PEER_CERTIFICATE: {
 	    long vfy_result = va_arg(alist, long);
 	    ok = va_arg(alist, int*);
 	    
 	    /* There is a table in handle_invalid_peer_certificate() of mail-file.c */
 	    crm_err("SMTP_EV_INVALID_PEER_CERTIFICATE: %ld", vfy_result);
 	    *ok = 1; break;
 	}
 	case SMTP_EV_NO_PEER_CERTIFICATE:
 	    ok = va_arg(alist, int*); 
 	    crm_debug("SMTP_EV_NO_PEER_CERTIFICATE - accepted.");
 	    *ok = 1;
 	    break;
 	case SMTP_EV_WRONG_PEER_CERTIFICATE:
 	    ok = va_arg(alist, int*);
 	    crm_debug("SMTP_EV_WRONG_PEER_CERTIFICATE - accepted.");
 	    *ok = 1;
 	    break;
 	case SMTP_EV_NO_CLIENT_CERTIFICATE:
 	    ok = va_arg(alist, int*); 
 	    crm_debug("SMTP_EV_NO_CLIENT_CERTIFICATE - accepted.");
 	    *ok = 1;
 	    break;
 	default:
 	    crm_debug("Got event: %d - ignored.\n", event_no);
     }
     va_end(alist);
 }
 #endif
 
 #define BODY_MAX 2048
 
 #if ENABLE_ESMTP
 static void
 crm_smtp_debug (const char *buf, int buflen, int writing, void *arg)
 {
     char type = 0;
     int lpc = 0, last = 0, level = *(int*)arg;
 
     if (writing == SMTP_CB_HEADERS) {
 	type = 'H';
     } else if(writing) {
 	type = 'C';
     } else {
 	type = 'S';
     }    
     
     for(; lpc < buflen; lpc++) {
 	switch(buf[lpc]) {
 	    case 0:
 	    case '\n':
 		if(last > 0) {
 		    do_crm_log(level, "   %.*s", lpc-last, buf+last);
 		} else {
 		    do_crm_log(level, "%c: %.*s", type, lpc-last, buf+last);
 		}
 		last = lpc + 1;
 		break;
 	}
     }
 }
 #endif
 
 static int
 send_custom_trap(const char *node, const char *rsc, const char *task, int target_rc, int rc, int status, const char *desc)
 {
 	pid_t pid;
 	/*setenv needs chars, these are ints*/
 	char *rc_s = crm_itoa(rc);
 	char *status_s = crm_itoa(status);
 	char *target_rc_s = crm_itoa(target_rc);
 
 	crm_debug("Sending external notification to '%s' via '%s'", external_recipient, external_agent);
 
 	setenv("CRM_notify_recipient",external_recipient,1);
 	setenv("CRM_notify_node",node,1);
 	setenv("CRM_notify_rsc",rsc,1);
 	setenv("CRM_notify_task",task,1);
 	setenv("CRM_notify_desc",desc,1);
 	setenv("CRM_notify_rc",rc_s,1);
 	setenv("CRM_notify_target_rc",target_rc_s,1);
 	setenv("CRM_notify_status",status_s,1);
 
 	pid=fork();
 	if(pid == -1) {
 		cl_perror("notification fork() failed.");
 	}
 	if(pid == 0) {
 		/* crm_debug("notification: I am the child. Executing the nofitication program."); */
 		execl(external_agent,external_agent,NULL);
 	}
 
 	crm_debug_2("Finished running custom notification program '%s'.",external_agent);
 	crm_free(target_rc_s);
 	crm_free(status_s);
 	crm_free(rc_s);
 	return 0;
 }
 
 static int
 send_smtp_trap(const char *node, const char *rsc, const char *task, int target_rc, int rc, int status, const char *desc)
 {
 #if ENABLE_ESMTP
     smtp_session_t session;
     smtp_message_t message;
     auth_context_t authctx;
     struct sigaction sa;
     
     int len = 20;
     int noauth = 1;
     int smtp_debug = LOG_DEBUG;
     char crm_mail_body[BODY_MAX];
     char *crm_mail_subject = NULL;
     
     if(node == NULL) {
 	node = "-";
     }
     if(rsc == NULL) {
 	rsc = "-";
     }
     if(desc == NULL) {
 	desc = "-";
     }
     
     if(crm_mail_to == NULL) {
 	return 1;
     }
     
     if(crm_mail_host == NULL) {
 	crm_mail_host = "localhost:25";
     }
 
     if(crm_mail_prefix == NULL) {
 	crm_mail_prefix = "Cluster notification";
     }
     
     crm_debug("Sending '%s' mail to %s via %s", crm_mail_prefix, crm_mail_to, crm_mail_host);
 
     len += strlen(crm_mail_prefix);
     len += strlen(task);
     len += strlen(rsc);
     len += strlen(node);
     len += strlen(desc);
     len++;
     
     crm_malloc0(crm_mail_subject, len);
     snprintf(crm_mail_subject, len, "%s - %s event for %s on %s: %s", crm_mail_prefix, task, rsc, node, desc);
 
     len = 0;
     len += snprintf(crm_mail_body+len, BODY_MAX-len, "%s\n", crm_mail_prefix);
     len += snprintf(crm_mail_body+len, BODY_MAX-len, "====\n\n");
     if(rc==target_rc) {
 	len += snprintf(crm_mail_body+len, BODY_MAX-len,
 			"Completed operation %s for resource %s on %s\n", task, rsc, node);
     } else {
 	len += snprintf(crm_mail_body+len, BODY_MAX-len,
 			"Operation %s for resource %s on %s failed: %s\n", task, rsc, node, desc);
     }
 
     len += snprintf(crm_mail_body+len, BODY_MAX-len, "\nDetails:\n");
     len += snprintf(crm_mail_body+len, BODY_MAX-len,
 		    "\toperation status: (%d) %s\n", status, op_status2text(status));
     if(status == LRM_OP_DONE) {
 	len += snprintf(crm_mail_body+len, BODY_MAX-len,
 			"\tscript returned: (%d) %s\n", rc, execra_code2string(rc));
 	len += snprintf(crm_mail_body+len, BODY_MAX-len,
 			"\texpected return value: (%d) %s\n", target_rc, execra_code2string(target_rc));			    
     }
     
     auth_client_init();
     session = smtp_create_session();
     message = smtp_add_message(session);
 
     smtp_starttls_enable (session, Starttls_ENABLED);
     
     sa.sa_handler = SIG_IGN;
     sigemptyset (&sa.sa_mask);
     sa.sa_flags = 0;
     sigaction (SIGPIPE, &sa, NULL); 
 
     smtp_set_server (session, crm_mail_host);
 
     authctx = auth_create_context ();
     auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
 
     smtp_set_eventcb(session, event_cb, NULL);
 
     /* Now tell libESMTP it can use the SMTP AUTH extension.
      */
     if (!noauth) {
 	crm_debug("Adding authentication context");
 	smtp_auth_set_context (session, authctx);
     }
     
     if(crm_mail_from == NULL) {
 	struct utsname us;
 	char auto_from[BODY_MAX];
 	
 	CRM_ASSERT(uname(&us) == 0);
 	snprintf(auto_from, BODY_MAX, "crm_mon@%s", us.nodename);
 	smtp_set_reverse_path (message, auto_from);
 
     } else {
 	/* NULL is ok */
 	smtp_set_reverse_path (message, crm_mail_from);
     }
     
     smtp_set_header (message, "To", NULL/*phrase*/, NULL/*addr*/); /* "Phrase" <addr> */ 
     smtp_add_recipient (message, crm_mail_to);
     
     /* Set the Subject: header and override any subject line in the message headers. */
     smtp_set_header (message, "Subject", crm_mail_subject);
     smtp_set_header_option (message, "Subject", Hdr_OVERRIDE, 1);
 
     smtp_set_message_str(message, crm_mail_body);
     smtp_set_monitorcb (session, crm_smtp_debug, &smtp_debug, 1);
 
     if (smtp_start_session (session)) {
 	char buf[128];
 	int rc = smtp_errno();
 	crm_err("SMTP server problem: %s (%d)\n", smtp_strerror (rc, buf, sizeof buf), rc);
 
     } else {
 	char buf[128];
 	int rc = smtp_errno();
 	const smtp_status_t *smtp_status = smtp_message_transfer_status(message);
 	if(rc != 0) {
 	    crm_err("SMTP server problem: %s (%d)\n", smtp_strerror (rc, buf, sizeof buf), rc);
 	}
 	crm_info("Send status: %d %s", smtp_status->code, crm_str(smtp_status->text));
 	smtp_enumerate_recipients (message, print_recipient_status, NULL);
     }
 
     smtp_destroy_session(session);
     auth_destroy_context(authctx);
     auth_client_exit();
 #endif
     return 0;
 }
 
 static void handle_rsc_op(xmlNode *rsc_op) 
 {
     int rc = -1;
     int status = -1;
     int action = -1;
     int interval = 0;
     int target_rc = -1;
     int transition_num = -1;
     gboolean notify = TRUE;
     
     char *rsc = NULL;
     char *task = NULL;
     const char *desc = NULL;
     const char *node = NULL;			     
     const char *magic = NULL;			     
     const char *id = ID(rsc_op);
     char *update_te_uuid = NULL;
 
     xmlNode *n = rsc_op;
     
     magic = crm_element_value(rsc_op, XML_ATTR_TRANSITION_MAGIC);
     if(magic == NULL) {
 	/* non-change */
 	return;
     }
 			
     if(FALSE == decode_transition_magic(
 	   magic, &update_te_uuid, &transition_num, &action,
 	   &status, &rc, &target_rc)) {
 	crm_err("Invalid event %s detected for %s", magic, id);
 	return;
     }
 			
     if(parse_op_key(id, &rsc, &task, &interval) == FALSE) {
 	crm_err("Invalid event detected for %s", id);
 	return;
     }
 
     while(n != NULL && safe_str_neq(XML_CIB_TAG_STATE, TYPE(n))) {
 	n = n->parent;
     }
 
     node = ID(n);
     if(node == NULL) {
 	crm_err("No node detected for event %s (%s)", magic, id);
 	return;
     }
 
     /* look up where we expected it to be? */
     desc = cib_error2string(cib_ok);
     if(status == LRM_OP_DONE && target_rc == rc) {
 	crm_notice("%s of %s on %s completed: %s", task, rsc, node, desc);
 	if(rc == EXECRA_NOT_RUNNING) {
 	    notify = FALSE;
 	}
 			    
     } else if(status == LRM_OP_DONE) {
 	desc = execra_code2string(rc);
 	crm_warn("%s of %s on %s failed: %s", task, rsc, node, desc);
 			    
     } else {
 	desc = op_status2text(status);
 	crm_warn("%s of %s on %s failed: %s", task, rsc, node, desc);
     }
 
     if(notify && snmp_target) {
 	send_snmp_trap(node, rsc, task, target_rc, rc, status, desc);
     }
     if(notify && crm_mail_to) {
 	send_smtp_trap(node, rsc, task, target_rc, rc, status, desc);
     }
     if(notify && external_agent) {
 	send_custom_trap(node, rsc, task, target_rc, rc, status, desc);
     }
 }
 
 void
 crm_diff_update(const char *event, xmlNode *msg)
 {
     int rc = -1;
     long now = time(NULL);
     const char *op = NULL;
     unsigned int log_level = LOG_INFO;
 
     xmlNode *diff = NULL;
     xmlNode *cib_last = NULL;
     xmlNode *update = get_message_xml(msg, F_CIB_UPDATE);
 
     print_dot();
 	
     if(msg == NULL) {
 	crm_err("NULL update");
 	return;
     }
     
     crm_element_value_int(msg, F_CIB_RC, &rc);	
     op = crm_element_value(msg, F_CIB_OPERATION);
     diff = get_message_xml(msg, F_CIB_UPDATE_RESULT);
 
     if(rc < cib_ok) {
 	log_level = LOG_WARNING;
 	do_crm_log(log_level, "[%s] %s ABORTED: %s",
 		   event, op, cib_error2string(rc));
 	return;	
     } 
 
     if(current_cib != NULL) {
 	cib_last = current_cib; current_cib = NULL;
 	rc = cib_process_diff(op, cib_force_diff, NULL, NULL, diff, cib_last, &current_cib, NULL);
 	
 	if(rc != cib_ok) {
 	    crm_debug("Update didn't apply, requesting full copy: %s", cib_error2string(rc));
 	    free_xml(current_cib);
 	    current_cib = NULL;
 	}
     }
     
     if(current_cib == NULL) {
 	current_cib = get_cib_copy(cib);
     }
 
     if(log_diffs && diff) {
 	log_cib_diff(LOG_DEBUG, diff, op);
     }
     
     if(log_updates && update != NULL) {
 	print_xml_formatted(LOG_DEBUG, "raw_update", update, NULL);
     }
 
     if(diff && (crm_mail_to || snmp_target || external_agent)) {
 	/* Process operation updates */
 	xmlXPathObject *xpathObj = xpath_search(
 	    diff, "//"F_CIB_UPDATE_RESULT"//"XML_TAG_DIFF_ADDED"//"XML_LRM_TAG_RSC_OP);
 	if(xpathObj && xpathObj->nodesetval->nodeNr > 0) {
 	    int lpc = 0, max = xpathObj->nodesetval->nodeNr;
 	    for(lpc = 0; lpc < max; lpc++) {
 		xmlNode *rsc_op = getXpathResult(xpathObj, lpc);
 		handle_rsc_op(rsc_op);
 	    }
 	    xmlXPathFreeObject(xpathObj);
 	}
     }
 
     if((now - last_refresh) > (reconnect_msec/1000)) {
 	/* Force a refresh */
 	mon_refresh_display(NULL);
 	
     } else {
 	mainloop_set_trigger(refresh_trigger);
     }
     free_xml(cib_last);
 }
 
 gboolean
 mon_refresh_display(gpointer user_data) 
 {
     xmlNode *cib_copy = copy_xml(current_cib);
     pe_working_set_t data_set;
 
     last_refresh = time(NULL);
     
     if(cli_config_update(&cib_copy, NULL, FALSE) == FALSE) {
 	if(cib) {
 	    cib->cmds->signoff(cib);
 	}
 	print_as("Upgrade failed: %s", cib_error2string(cib_dtd_validation));
 	if(as_console) { sleep(2); }
 	clean_up(LSB_EXIT_GENERIC);
 	return FALSE;
     }
 
     set_working_set_defaults(&data_set);
     data_set.input = cib_copy;
     cluster_status(&data_set);	
 
     if(as_html_file || web_cgi) {
 	if (print_html_status(&data_set, as_html_file, web_cgi) != 0) {
 	    fprintf(stderr, "Critical: Unable to output html file\n");
 	    clean_up(LSB_EXIT_GENERIC);
 	}
 	
     } else if(daemonize) {
 	/* do nothing */
 
     } else if (simple_status) {
 	print_simple_status(&data_set);
 	if (has_warnings) {
 	    clean_up(LSB_EXIT_GENERIC);
 	}
 	
     } else {
 	print_status(&data_set);
     }
     
     cleanup_calculations(&data_set);
     return TRUE;
 }
 
 /*
  * De-init ncurses, signoff from the CIB and deallocate memory.
  */
 void clean_up(int rc)
 {
 #if ENABLE_SNMP
     netsnmp_session *session = crm_snmp_init(NULL);
     if(session) {
 	snmp_close(session);
 	snmp_shutdown("snmpapp");
     }
 #endif    
 
 #if CURSES_ENABLED
     if(as_console) {
 	as_console = FALSE;
 	echo();
 	nocbreak();
 	endwin();
     }
 #endif
 
     if (cib != NULL) {
 	cib->cmds->signoff(cib);
 	cib_delete(cib);
 	cib = NULL;
     }
 
     crm_free(as_html_file);
     crm_free(xml_file);
     crm_free(pid_file);
 
     if(rc >= 0) {
 	exit(rc);
     }
     return;
 }