diff --git a/mcp/corosync.c b/mcp/corosync.c
index f27703fa09..7106cdad03 100644
--- a/mcp/corosync.c
+++ b/mcp/corosync.c
@@ -1,603 +1,610 @@
 /* 
  * Copyright (C) 2010 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 <pacemaker.h>
 
 #include <sys/utsname.h>
 
 #include <corosync/cfg.h>
 #include <corosync/cpg.h>
 #include <corosync/confdb.h>
 #include <libcman.h>
 
 static struct cpg_name cpg_group = {
     .length = 0,
     .value[0] = 0,
 };
 
 gboolean use_cman = FALSE;
 static cpg_handle_t cpg_handle;
 static corosync_cfg_handle_t cfg_handle;
 static corosync_cfg_state_notification_t cfg_buffer;
 
 static inline const char *ais_error2text(int error) 
 {
 	const char *text = "unknown";
 	switch(error) {
 	    case CS_OK:
 		text = "None";
 		break;
 	    case CS_ERR_LIBRARY:
 		text = "Library error";
 		break;
 	    case CS_ERR_VERSION:
 		text = "Version error";
 		break;
 	    case CS_ERR_INIT:
 		text = "Initialization error";
 		break;
 	    case CS_ERR_TIMEOUT:
 		text = "Timeout";
 		break;
 	    case CS_ERR_TRY_AGAIN:
 		text = "Try again";
 		break;
 	    case CS_ERR_INVALID_PARAM:
 		text = "Invalid parameter";
 		break;
 	    case CS_ERR_NO_MEMORY:
 		text = "No memory";
 		break;
 	    case CS_ERR_BAD_HANDLE:
 		text = "Bad handle";
 		break;
 	    case CS_ERR_BUSY:
 		text = "Busy";
 		break;
 	    case CS_ERR_ACCESS:
 		text = "Access error";
 		break;
 	    case CS_ERR_NOT_EXIST:
 		text = "Doesn't exist";
 		break;
 	    case CS_ERR_NAME_TOO_LONG:
 		text = "Name too long";
 		break;
 	    case CS_ERR_EXIST:
 		text = "Exists";
 		break;
 	    case CS_ERR_NO_SPACE:
 		text = "No space";
 		break;
 	    case CS_ERR_INTERRUPT:
 		text = "Interrupt";
 		break;
 	    case CS_ERR_NAME_NOT_FOUND:
 		text = "Name not found";
 		break;
 	    case CS_ERR_NO_RESOURCES:
 		text = "No resources";
 		break;
 	    case CS_ERR_NOT_SUPPORTED:
 		text = "Not supported";
 		break;
 	    case CS_ERR_BAD_OPERATION:
 		text = "Bad operation";
 		break;
 	    case CS_ERR_FAILED_OPERATION:
 		text = "Failed operation";
 		break;
 	    case CS_ERR_MESSAGE_ERROR:
 		text = "Message error";
 		break;
 	    case CS_ERR_QUEUE_FULL:
 		text = "Queue full";
 		break;
 	    case CS_ERR_QUEUE_NOT_AVAILABLE:
 		text = "Queue not available";
 		break;
 	    case CS_ERR_BAD_FLAGS:
 		text = "Bad flags";
 		break;
 	    case CS_ERR_TOO_BIG:
 		text = "To big";
 		break;
 	    case CS_ERR_NO_SECTIONS:
 		text = "No sections";
 		break;
 	}
 	return text;
 }
 
 /* =::=::=::= CFG - Shutdown stuff =::=::=::= */
 
 static void cfg_shutdown_callback(corosync_cfg_handle_t h,
 				  corosync_cfg_shutdown_flags_t flags)
 {
     if (flags & COROSYNC_CFG_SHUTDOWN_FLAG_REQUEST) {
 	/* Never allow corosync to shut down while we're running */
 	crm_info("Corosync wants to shut down: %s",
 		 (flags&COROSYNC_CFG_SHUTDOWN_FLAG_IMMEDIATE)?"immediate":
 		 (flags&COROSYNC_CFG_SHUTDOWN_FLAG_REGARDLESS)?"forced":"optional");
 	corosync_cfg_replyto_shutdown(h, COROSYNC_CFG_SHUTDOWN_FLAG_NO);
     }
 }
 
 static corosync_cfg_callbacks_t cfg_callbacks =
 {
     .corosync_cfg_shutdown_callback = cfg_shutdown_callback,
     .corosync_cfg_state_track_callback = NULL,
 };
 
 static gboolean pcmk_cfg_dispatch(int sender, gpointer user_data)
 {
     corosync_cfg_handle_t *handle = (corosync_cfg_handle_t*)user_data;
     cs_error_t rc = corosync_cfg_dispatch(*handle, CS_DISPATCH_ALL);
     if (rc != CS_OK) {
 	return FALSE;
     }
     return TRUE;
 }
 
 static void
 cfg_connection_destroy(gpointer user_data)
 {
     crm_err("Connection destroyed");
     cfg_handle = 0;
     return;
 }
 
 gboolean cluster_disconnect_cfg(void)
 {
     if(cfg_handle) {
 	corosync_cfg_finalize(cfg_handle);
 	cfg_handle = 0;
     }
     return TRUE;
 }
 
 gboolean cluster_connect_cfg(uint32_t *nodeid)
 {
     cs_error_t rc;
     int fd;
 
     rc = corosync_cfg_initialize(&cfg_handle, &cfg_callbacks);
     if (rc != CS_OK) {
 	crm_err("corosync cfg init error %d", rc);
 	return FALSE;
     }
 
     rc = corosync_cfg_fd_get(cfg_handle, &fd);
     if (rc != CS_OK) {
 	crm_err("corosync cfg fd_get error %d", rc);
 	goto bail;
     }
 
     rc = corosync_cfg_local_get(cfg_handle, nodeid);
     if (rc != CS_OK) {
 	crm_err("corosync cfg local_get error %d", rc);
 	goto bail;
     }
 
     crm_debug("Our nodeid: %d", *nodeid);
 
     rc = corosync_cfg_state_track (cfg_handle, 0, &cfg_buffer);
     if (rc != CS_OK) {
 	crm_err("corosync cfg stack_track error %d", rc);
 	goto bail;
     }
     
     crm_debug("Adding fd=%d to mainloop", fd);
     G_main_add_fd(
 	G_PRIORITY_HIGH, fd, FALSE, pcmk_cfg_dispatch, &cfg_handle, cfg_connection_destroy);
     
     return TRUE;
 
   bail:
     corosync_cfg_finalize(cfg_handle);
     return FALSE;
 }
 
 /* =::=::=::= CPG - Closed Process Group Messaging =::=::=::= */
 
 static gboolean pcmk_cpg_dispatch(int sender, gpointer user_data)
 {
     cpg_handle_t *handle = (cpg_handle_t*)user_data;
     cs_error_t rc = cpg_dispatch(*handle, CS_DISPATCH_ALL);
     if (rc != CS_OK) {
 	return FALSE;
     }
     return TRUE;
 }
 
 static void
 cpg_connection_destroy(gpointer user_data)
 {
     crm_err("Connection destroyed");
     cpg_handle = 0;
     return;
 }
 
 static void pcmk_cpg_deliver (
 	cpg_handle_t handle,
 	const struct cpg_name *groupName,
 	uint32_t nodeid,
 	uint32_t pid,
 	void *msg,
 	size_t msg_len)
 {
     if(nodeid != local_nodeid) {
 	uint32_t procs = 0;
 	xmlNode *xml = string2xml(msg);
 	const char *uname = crm_element_value(xml, "uname");
 
 	crm_element_value_int(xml, "proclist", (int*)&procs);
 	/* crm_debug("Got proclist %.32x from %s", procs, uname); */
 	if(update_node_processes(nodeid, uname, procs)) {
 	    update_process_clients();
 	}
     }
 }
 
 static void pcmk_cpg_membership(
 	cpg_handle_t handle,
 	const struct cpg_name *groupName,
 	const struct cpg_address *member_list, size_t member_list_entries,
 	const struct cpg_address *left_list, size_t left_list_entries,
 	const struct cpg_address *joined_list, size_t joined_list_entries)
 {
     /* Don't care about CPG membership */
 }
 
 cpg_callbacks_t cpg_callbacks = {
     .cpg_deliver_fn =            pcmk_cpg_deliver,
     .cpg_confchg_fn =            pcmk_cpg_membership,
 };
 
 gboolean cluster_disconnect_cpg(void)
 {
     if(cpg_handle) {
 	cpg_finalize(cpg_handle);
 	cpg_handle = 0;
     }
     return TRUE;
 }
 
 gboolean cluster_connect_cpg(void)
 {
     cs_error_t rc;
     unsigned int nodeid;
     int fd;
     int retries = 0;
     
     strcpy(cpg_group.value, "pcmk");
     cpg_group.length = strlen(cpg_group.value)+1;
     
     rc = cpg_initialize(&cpg_handle, &cpg_callbacks);
     if (rc != CS_OK) {
 	crm_err("corosync cpg init error %d", rc);
 	return FALSE;
     }
 
     rc = cpg_fd_get(cpg_handle, &fd);
     if (rc != CS_OK) {
 	crm_err("corosync cpg fd_get error %d", rc);
 	goto bail;
     }
 
     rc = cpg_local_get(cpg_handle, &nodeid);
     if (rc != CS_OK) {
 	crm_err("corosync cpg local_get error %d", rc);
 	goto bail;
     }
 
     crm_debug("Our nodeid: %d", nodeid);
 
     do {
 	rc = cpg_join(cpg_handle, &cpg_group);
 	if(rc == CS_ERR_TRY_AGAIN) {
 	    retries++;
 	    sleep(retries);
 	}
 	
     } while(rc == CS_ERR_TRY_AGAIN && retries < 30);
     
     if (rc != CS_OK) {
 	crm_err("Could not join the CPG group '%s': %d", crm_system_name, rc);
 	goto bail;
     }
     
     crm_debug("Adding fd=%d to mainloop", fd);
     G_main_add_fd(
 	G_PRIORITY_HIGH, fd, FALSE, pcmk_cpg_dispatch, &cpg_handle, cpg_connection_destroy);
     
     return TRUE;
 
   bail:
     cpg_finalize(cpg_handle);
     return FALSE;
 }
 
 gboolean send_cpg_message(struct iovec *iov) 
 {
     int rc = CS_OK;
     int retries = 0;
 
     errno = 0;
     do {
 	rc = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, 1);
 	if(rc == CS_ERR_TRY_AGAIN) {
 	    retries++;
 	    sleep(retries);
 	}
 	
     } while(rc == CS_ERR_TRY_AGAIN && retries < 30);
     
     if(rc != CS_OK) {    
 	crm_perror(LOG_ERR,"Sending message via cpg FAILED: (rc=%d) %s",
 		   rc, ais_error2text(rc));
     }
 
     return (rc == CS_OK);
 }
 
 
 /* =::=::=::= Configuration =::=::=::= */
 
 static int get_config_opt(
     confdb_handle_t config,
     hdb_handle_t object_handle,
     const char *key, char **value, const char *fallback)
 {
     size_t len = 0;
     char *env_key = NULL;
     const char *env_value = NULL;
     char buffer[256];
 
     if(*value) {
 	crm_free(*value);
 	*value = NULL;
     }
 
     if(object_handle > 0) {
 	if(CS_OK == confdb_key_get(config, object_handle, key, strlen(key), &buffer, &len)) {
 	    *value = crm_strdup(buffer);
 	}
     }
     
     if (*value) {
 	crm_info("Found '%s' for option: %s", *value, key);
 	return 0;
     }
 
     env_key = crm_concat("HA", key, '_');
     env_value = getenv(env_key);
     crm_free(env_key);
 
     if (*value) {
 	crm_info("Found '%s' in ENV for option: %s", *value, key);
 	*value = crm_strdup(env_value);
 	return 0;
     }
 
     if(fallback) {
 	crm_info("Defaulting to '%s' for option: %s", fallback, key);
 	*value = crm_strdup(fallback);
 
     } else {
 	crm_info("No default for option: %s", key);
     }
     
     return -1;
 }
 
 static confdb_handle_t config_find_init(confdb_handle_t config) 
 {
     cs_error_t rc = CS_OK;    
     confdb_handle_t local_handle = OBJECT_PARENT_HANDLE;
 
     rc = confdb_object_find_start(config, local_handle);
     if(rc == CS_OK) {
 	return local_handle;
     } else {
 	crm_err("Couldn't create search context: %d", rc);
     }
     return 0;
 }
 
 static hdb_handle_t config_find_next(
     confdb_handle_t config, const char *name, confdb_handle_t top_handle) 
 {
     cs_error_t rc = CS_OK;
     hdb_handle_t local_handle = 0;
 
     if(top_handle == 0) {
 	crm_err("Couldn't search for %s: no valid context", name);
 	return 0;
     }
     
     crm_info("Searching for %s in "HDB_X_FORMAT, name, top_handle);
     rc = confdb_object_find(config, top_handle, name, strlen(name), &local_handle);
     if(rc != CS_OK) {
 	crm_info("No additional configuration supplied for: %s", name);
 	local_handle = 0;
     } else {
 	crm_info("Processing additional %s options...", name);
     }
     return local_handle;
 }
 
 char *get_local_node_name(void) 
 {
     char *name = NULL;
     struct utsname res;
     
     if(use_cman) {
+#ifdef SUPPORT_CMAN
 	cman_node_t us;
 	cman_handle_t cman;
 
 	cman = cman_init(NULL);
 	if(cman != NULL && cman_is_active(cman)) {
 	    us.cn_name[0] = 0;
 	    cman_get_node(cman, CMAN_NODEID_US, &us);
 	    name = crm_strdup(us.cn_name);
 	    crm_info("Using CMAN node name: %s", name);
 
 	} else {
 	    crm_err("Couldn't determin node name from CMAN");
 	}
 	    
 	cman_finish(cman);
+#endif
 	
     } else if(uname(&res) < 0) {
 	crm_perror(LOG_ERR,"Could not determin the current host");
 	exit(100);
 	
     } else {
 	name = crm_strdup(res.nodename);
     }
     return name;
 }
 
 gboolean read_config(void) 
 {
     confdb_handle_t config;
 
     int rc;
     char *value = NULL;
     gboolean have_log = FALSE;
     gboolean have_quorum = FALSE;
     confdb_handle_t top_handle = 0;
     hdb_handle_t local_handle = 0;
     static confdb_callbacks_t callbacks = {};
 
 
     rc = confdb_initialize (&config, &callbacks);
     if (rc != CS_OK) {
 	printf ("Could not initialize Cluster Configuration Database API instance error %d\n", rc);
 	return FALSE;
     }
 
     crm_info("Reading configure");
 
     /* =::=::= Defaults =::=::= */
     setenv("HA_COMPRESSION",	"bz2",     1);
     setenv("HA_cluster_type",	"corosync",1);
     setenv("HA_debug",		"0",       1);
     setenv("HA_logfacility",	"daemon",  1);
     setenv("HA_LOGFACILITY",	"daemon",  1);
     setenv("HA_use_logd",       "off",     1);
 
     /* =::=::= Should we be here =::=::= */
     
     top_handle = config_find_init(config);
     local_handle = config_find_next(config, "service", top_handle);
     while(local_handle) {
 	get_config_opt(config, local_handle, "name", &value, NULL);
 	if(safe_str_eq("pacemaker", value)) {
 	    setenv("HA_cluster_type", "openais",  1);
 	    crm_err("Pacemaker is already loaded as a plugin");
 	    crm_free(value);
 	    exit(100);
 	}
 	local_handle = config_find_next(config, "service", top_handle);
     }
     
     /* =::=::= Logging =::=::= */
 
     top_handle = config_find_init(config);
     local_handle = config_find_next(config, "logging", top_handle);
     
     get_config_opt(config, local_handle, "debug", &value, "on");
     if(crm_is_true(value) && crm_log_level < LOG_DEBUG) {
 	crm_log_level = LOG_DEBUG;
     }    
 
     if(crm_log_level >= LOG_DEBUG) {
 	char *level = crm_itoa(crm_log_level - LOG_INFO);
 	setenv("HA_debug", level, 1);
 	crm_free(level);
     }
     
     get_config_opt(config, local_handle, "to_logfile", &value, "off");
     if(crm_is_true(value)) {
 	get_config_opt(config, local_handle, "logfile", &value, NULL);
 
 	if(value == NULL) {
 	    crm_err("Logging to a file requested but no log file specified");
 
 	} else {
 	    uid_t pcmk_uid = geteuid();
 	    uid_t pcmk_gid = getegid();
 
 	    FILE *logfile = fopen(value, "a");
 	    if(logfile) {
 		int logfd = fileno(logfile);
 
 		setenv("HA_debugfile", value, 1);
 	
 		/* Ensure the file has the correct permissions */
 		fchown(logfd, pcmk_uid, pcmk_gid);
 		fchmod(logfd, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
 		
 		fprintf(logfile, "Set r/w permissions for uid=%d, gid=%d on %s\n",
 			pcmk_uid, pcmk_gid, value);
 		fflush(logfile);
 		fsync(logfd);
 		fclose(logfile);
 		have_log = TRUE;
 
 	    } else {
 		crm_err("Couldn't create logfile: %s", value);
 	    }
 	}
     }
 
     get_config_opt(config, local_handle, "to_syslog", &value, "on");
     if(have_log && crm_is_true(value) == FALSE) {
 	crm_info("User configured file based logging and explicitly disabled syslog.");
 	value = NULL;
 
     } else {
 	if(crm_is_true(value) == FALSE) {
 	    crm_err("Please enable some sort of logging, either 'to_file: on' or  'to_syslog: on'.");
 	    crm_err("If you use file logging, be sure to also define a value for 'logfile'");	    
 	}
 	get_config_opt(config, local_handle, "syslog_facility", &value, "daemon");
     }
     
     setenv("HA_logfacility", value?value:"none", 1);
     setenv("HA_LOGFACILITY", value?value:"none", 1);
 
     /* =::=::= Quorum =::=::= */
 
     top_handle = config_find_init(config);
     local_handle = config_find_next(config, "quorum", top_handle);
     get_config_opt(config, local_handle, "provider", &value, NULL);
     if(value) {
 	have_quorum = TRUE;
 	if(safe_str_eq("quorum_cman", value)) {
+#ifdef SUPPORT_CMAN
 	    setenv("HA_cluster_type", "cman",  1);
 	    use_cman = TRUE;
+#else
+	    crm_err("Corosync configured for CMAN but this build of Pacemaker doesn't support it");
+	    exit(100);
+#endif
 	}
     }
 
     confdb_finalize (config);
     crm_free(value);
     return TRUE;
 }