diff --git a/src/config.c b/src/config.c
index 2cf46c1..e4d7f82 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,847 +1,850 @@
 /* 
  * Copyright (C) 2011 Jiaju Zhang <jjzhang@suse.de>
  * Copyright (C) 2013-2014 Philipp Marek <philipp.marek@linbit.com>
  * 
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <zlib.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #include <string.h>
 #include "b_config.h"
 #include "booth.h"
 #include "config.h"
 #include "raft.h"
 #include "ticket.h"
 #include "log.h"
 
 static int ticket_size = 0;
 
 static int ticket_realloc(void)
 {
 	const int added = 5;
 	int had, want;
 	void *p;
 
 	had = booth_conf->ticket_allocated;
 	want = had + added;
 
 	p = realloc(booth_conf->ticket,
 			sizeof(struct ticket_config) * want);
 	if (!p) {
 		log_error("can't alloc more tickets");
 		return -ENOMEM;
 	}
 
 	booth_conf->ticket = p;
 	memset(booth_conf->ticket + had, 0,
 			sizeof(struct ticket_config) * added);
 	booth_conf->ticket_allocated = want;
 
 	return 0;
 }
 
 
 int add_site(char *address, int type);
 int add_site(char *addr_string, int type)
 {
 	int rv;
 	struct booth_site *site;
 	uLong nid;
 	uint32_t mask;
 	int i;
 
 
 	rv = 1;
 	if (booth_conf->site_count == MAX_NODES) {
 		log_error("too many nodes");
 		goto out;
 	}
 	if (strlen(addr_string)+1 >= sizeof(booth_conf->site[0].addr_string)) {
 		log_error("site address \"%s\" too long", addr_string);
 		goto out;
 	}
 
 	site = booth_conf->site + booth_conf->site_count;
 
 	site->family = BOOTH_PROTO_FAMILY;
 	site->type = type;
 	/* Make site_id start at a non-zero point.
 	 * Perhaps use hash over string or address? */
 	strcpy(site->addr_string, addr_string);
 
 
 	site->index = booth_conf->site_count;
 	site->bitmask = 1 << booth_conf->site_count;
 	/* Catch site overflow */
 	assert(site->bitmask);
 	booth_conf->all_bits |= site->bitmask;
 	if (type == SITE)
 		booth_conf->sites_bits |= site->bitmask;
 
 	site->tcp_fd = -1;
 
 	booth_conf->site_count++;
 
 	rv = 0;
 	memset(&site->sa6, 0, sizeof(site->sa6));
 
 	nid = crc32(0L, NULL, 0);
 	/* Using the ASCII representation in site->addr_string (both sizeof()
 	 * and strlen()) gives quite a lot of collisions; a brute-force run
 	 * from 0.0.0.0 to 24.0.0.0 gives ~4% collisions, and this tends to
 	 * increase even more.
 	 * Whether there'll be a collision in real-life, with 3 or 5 nodes, is
 	 * another question ... but for now get the ID from the binary
 	 * representation - that had *no* collisions up to 32.0.0.0. */
 	if (inet_pton(AF_INET,
 				site->addr_string,
 				&site->sa4.sin_addr) > 0) {
 
 		site->family = AF_INET;
 		site->sa4.sin_family = site->family;
 		site->sa4.sin_port = htons(booth_conf->port);
 		site->saddrlen = sizeof(site->sa4);
 		site->addrlen = sizeof(site->sa4.sin_addr);
 		site->site_id = crc32(nid, (void*)&site->sa4.sin_addr, site->addrlen);
 
 	} else if (inet_pton(AF_INET6,
 				site->addr_string,
 				&site->sa6.sin6_addr) > 0) {
 
 		site->family = AF_INET6;
 		site->sa6.sin6_family = site->family;
 		site->sa6.sin6_flowinfo = 0;
 		site->sa6.sin6_port = htons(booth_conf->port);
 		site->saddrlen = sizeof(site->sa6);
 		site->addrlen = sizeof(site->sa6.sin6_addr);
 		site->site_id = crc32(nid, (void*)&site->sa6.sin6_addr, site->addrlen);
 
 	} else {
 		log_error("Address string \"%s\" is bad", site->addr_string);
 		rv = EINVAL;
 	}
 
 	/* Make sure we will never collide with NO_ONE,
 	 * or be negative (to get "get_local_id() < 0" working). */
 	mask = 1 << (sizeof(site->site_id)*8 -1);
 	assert(NO_ONE & mask);
 	site->site_id &= ~mask;
 
 
 	/* Test for collisions with other sites */
 	for(i=0; i<site->index; i++)
 		if (booth_conf->site[i].site_id == site->site_id) {
 			log_error("Got a site-ID collision. Please file a bug on https://github.com/ClusterLabs/booth/issues/new, attaching the configuration file.");
 			exit(1);
 		}
 
 out:
 	return rv;
 }
 
 
 inline static char *skip_while_in(const char *cp, int (*fn)(int), const char *allowed)
 {
 	/* strchr() returns a pointer to the terminator if *cp == 0. */
 	while (*cp &&
 			(fn(*cp) ||
 			 strchr(allowed, *cp)))
 		cp++;
 	/* discard "const" qualifier */
 	return (char*)cp;
 }
 
 
 inline static char *skip_while(char *cp, int (*fn)(int))
 {
 	while (fn(*cp))
 		cp++;
 	return cp;
 }
 
 inline static char *skip_until(char *cp, char expected)
 {
 	while (*cp && *cp != expected)
 		cp++;
 	return cp;
 }
 
 
 static inline int is_end_of_line(char *cp)
 {
 	char c = *cp;
 	return c == '\n' || c == 0 || c == '#';
 }
 
 
 static int add_ticket(const char *name, struct ticket_config **tkp,
 		const struct ticket_config *def)
 {
 	int rv;
 	struct ticket_config *tk;
 
 
 	if (booth_conf->ticket_count == booth_conf->ticket_allocated) {
 		rv = ticket_realloc();
 		if (rv < 0)
 			return rv;
 	}
 
 
 	tk = booth_conf->ticket + booth_conf->ticket_count;
 	booth_conf->ticket_count++;
 
 	tk->last_valid_tk = malloc(sizeof(struct ticket_config));
 	if (!tk->last_valid_tk) {
 		log_error("out of memory");
 		return -ENOMEM;
 	}
 	memset(tk->last_valid_tk, 0, sizeof(struct ticket_config));
 
 	if (!check_max_len_valid(name, sizeof(tk->name))) {
 		log_error("ticket name \"%s\" too long.", name);
 		return -EINVAL;
 	}
 
 	if (find_ticket_by_name(name, NULL)) {
 		log_error("ticket name \"%s\" used again.", name);
 		return -EINVAL;
 	}
 
 	if (* skip_while_in(name, isalnum, "-/")) {
 		log_error("ticket name \"%s\" invalid; only alphanumeric names.", name);
 		return -EINVAL;
 	}
 
 	strcpy(tk->name, name);
 	tk->timeout = def->timeout;
 	tk->term_duration = def->term_duration;
 	tk->retries = def->retries;
 	memcpy(tk->weight, def->weight, sizeof(tk->weight));
 
 	if (tkp)
 		*tkp = tk;
 	return 0;
 }
 
 static int postproc_ticket(struct ticket_config *tk)
 {
 	if (!tk)
 		return 1;
 
 	if (!tk->renewal_freq) {
 		tk->renewal_freq = tk->term_duration/2;
 	}
 
 	if (tk->timeout*(tk->retries+1) >= tk->renewal_freq) {
 		log_error("%s: total amount of time to "
 			"retry sending packets cannot exceed "
 			"renewal frequency "
 			"(%d*(%d+1) >= %d)",
 			tk->name, tk->timeout, tk->retries, tk->renewal_freq);
 		return 0;
 	}
 	return 1;
 }
 
 /* returns number of weights, or -1 on bad input. */
 static int parse_weights(const char *input, int weights[MAX_NODES])
 {
 	int i, v;
 	char *cp;
 
 	for(i=0; i<MAX_NODES; i++) {
 		/* End of input? */
 		if (*input == 0)
 			break;
 
 		v = strtol(input, &cp, 0);
 		if (input == cp) {
 			log_error("No integer weight value at \"%s\"", input);
 			return -1;
 		}
 
 		weights[i] = v;
 
 		while (*cp) {
 			/* Separator characters */
 			if (isspace(*cp) ||
 					strchr(",;:-+", *cp))
 				cp++;
 			/* Next weight */
 			else if (isdigit(*cp))
 				break;
 			/* Rest */
 			else {
 				log_error("Invalid character at \"%s\"", cp);
 				return -1;
 			}
 		}
 
 		input = cp;
 	}
 
 
 	/* Fill rest of vector. */
 	for(v=i; v<MAX_NODES; v++) {
 		weights[v] = 0;
 	}
 
 	return i;
 }
 
 
 /* scan val for time; time is [0-9]+(ms)?, i.e. either in seconds
  * or milliseconds
  * returns -1 on failure, otherwise time in ms
  */
 static long read_time(char *val)
 {
 	long t;
 	char *ep;
 
 	t = strtol(val, &ep, 10);
 	if (ep == val) { /* matched none */
 		t = -1L;
 	} else if (*ep == '\0') { /* matched all */
 		t = t*1000L; /* in seconds, convert to ms */
 	} else if (strcmp(ep, "ms")) { /* ms not exactly matched */
 		t = -1L;
 	} /* otherwise, time in ms */
 	/* if second fractions configured, send finer resolution
 	 * times (i.e. term_valid_for) */
 	if (t % 1000L) {
 		TIME_MULT = 1000;
 	}
 	return t;
 }
 
 /* make arguments for execv(2)
  * tk->clu_test.prog points to the path
  * tk->clu_test.argv is argument vector (starts with the prog)
  * (strtok pokes holes in the configuration parameter value, i.e.
  * we don't need to allocate memory for arguments)
  */
 static int parse_extprog(char *val, struct ticket_config *tk)
 {
 	char *p;
 	int i = 0;
 
 	if (tk->clu_test.prog) {
 		free(tk->clu_test.prog);
 	}
 	if (!(tk->clu_test.prog = strdup(val))) {
 		log_error("out of memory");
 		return -1;
 	}
 
 	p = strtok(tk->clu_test.prog, " \t");
 	tk->clu_test.argv[i++] = p;
 	do {
 		p = strtok(NULL, " \t");
 		if (i >= MAX_ARGS) {
 			log_error("too many arguments for the acquire-handler");
 			free(tk->clu_test.prog);
 			return -1;
 		}
 		tk->clu_test.argv[i++] = p;
 	} while (p);
 
 	return 0;
 }
 
 extern int poll_timeout;
 
 int read_config(const char *path, int type)
 {
 	char line[1024];
 	FILE *fp;
 	char *s, *key, *val, *end_of_key;
 	const char *error;
 	char *cp, *cp2;
 	int i;
 	int lineno = 0;
 	int got_transport = 0;
 	int min_timeout = 0;
 	struct ticket_config defaults = { { 0 } };
 	struct ticket_config *current_tk = NULL;
 
 
 	fp = fopen(path, "r");
 	if (!fp) {
 		log_error("failed to open %s: %s", path, strerror(errno));
 		return -1;
 	}
 
 	booth_conf = malloc(sizeof(struct booth_config)
 			+ TICKET_ALLOC * sizeof(struct ticket_config));
 	if (!booth_conf) {
 		log_error("failed to alloc memory for booth config");
 		return -ENOMEM;
 	}
 	memset(booth_conf, 0, sizeof(struct booth_config)
 			+ TICKET_ALLOC * sizeof(struct ticket_config));
 	ticket_size = TICKET_ALLOC;
 
 
 	booth_conf->proto = UDP;
 	booth_conf->port = BOOTH_DEFAULT_PORT;
 	booth_conf->maxtimeskew = BOOTH_DEFAULT_MAX_TIME_SKEW;
 	booth_conf->authkey[0] = '\0';
 
 
 	/* Provide safe defaults. -1 is reserved, though. */
 	booth_conf->uid = -2;
 	booth_conf->gid = -2;
 	strcpy(booth_conf->site_user,  "hacluster");
 	strcpy(booth_conf->site_group, "haclient");
 	strcpy(booth_conf->arb_user,   "nobody");
 	strcpy(booth_conf->arb_group,  "nobody");
 
 	parse_weights("", defaults.weight);
 	defaults.clu_test.prog  = NULL;
 	defaults.clu_test.pid  = 0;
 	defaults.clu_test.status  = 0;
 	defaults.clu_test.progstate  = EXTPROG_IDLE;
 	defaults.term_duration        = DEFAULT_TICKET_EXPIRY;
 	defaults.timeout       = DEFAULT_TICKET_TIMEOUT;
 	defaults.retries       = DEFAULT_RETRIES;
 	defaults.acquire_after = 0;
 
 	error = "";
 
 	log_debug("reading config file %s", path);
 	while (fgets(line, sizeof(line), fp)) {
 		lineno++;
 
 		s = skip_while(line, isspace);
 		if (is_end_of_line(s))
 			continue;
 		key = s;
 
 
 		/* Key */
 		end_of_key = skip_while_in(key, isalnum, "-_");
 		if (end_of_key == key) {
 			error = "No key";
 			goto err;
 		}
 
 		if (!*end_of_key)
 			goto exp_equal;
 
 
 		/* whitespace, and something else but nothing more? */
 		s = skip_while(end_of_key, isspace);
 
 
 		if (*s != '=') {
 exp_equal:
 			error = "Expected '=' after key";
 			goto err;
 		}
 		s++;
 
 		/* It's my buffer, and I terminate if I want to. */
 		/* But not earlier than that, because we had to check for = */
 		*end_of_key = 0;
 
 
 		/* Value tokenizing */
 		s = skip_while(s, isspace);
 		switch (*s) {
 			case '"':
 			case '\'':
 				val = s+1;
 				s = skip_until(val, *s);
 				/* Terminate value */
 				if (!*s) {
 					error = "Unterminated quoted string";
 					goto err;
 				}
 
 				/* Remove and skip quote */
 				*s = 0;
 				s++;
 				if (* skip_while(s, isspace)) {
 					error = "Surplus data after value";
 					goto err;
 				}
 
 				*s = 0;
 
 				break;
 
 			case 0:
 no_value:
 				error = "No value";
 				goto err;
 				break;
 
 			default:
 				val = s;
 				/* Rest of line. */
 				i = strlen(s);
 				/* i > 0 because of "case 0" above. */
 				while (i > 0 && isspace(s[i-1]))
 					i--;
 				s += i;
 				*s = 0;
 		}
 
 		if (val == s)
 			goto no_value;
 
 
 		if (strlen(key) > BOOTH_NAME_LEN
 				|| strlen(val) > BOOTH_NAME_LEN) {
 			error = "key/value too long";
 			goto err;
 		}
 
 		if (strcmp(key, "transport") == 0) {
 			if (got_transport) {
 				error = "config file has multiple transport lines";
 				goto err;
 			}
 
 			if (strcasecmp(val, "UDP") == 0)
 				booth_conf->proto = UDP;
 			else if (strcasecmp(val, "SCTP") == 0)
 				booth_conf->proto = SCTP;
 			else {
 				error = "invalid transport protocol";
 				goto err;
 			}
 			got_transport = 1;
 			continue;
 		}
 
 		if (strcmp(key, "port") == 0) {
 			booth_conf->port = atoi(val);
 			continue;
 		}
 
 		if (strcmp(key, "name") == 0) {
 			safe_copy(booth_conf->name, 
 					val, BOOTH_NAME_LEN,
 					"name");
 			continue;
 		}
 
 #if HAVE_LIBGCRYPT || HAVE_LIBMHASH
 		if (strcmp(key, "authfile") == 0) {
 			safe_copy(booth_conf->authfile,
 					val, BOOTH_PATH_LEN,
 					"authfile");
 			continue;
 		}
 
 		if (strcmp(key, "maxtimeskew") == 0) {
 			booth_conf->maxtimeskew = atoi(val);
 			continue;
 		}
 #endif
 
 		if (strcmp(key, "site") == 0) {
 			if (add_site(val, SITE))
 				goto out;
 			continue;
 		}
 
 		if (strcmp(key, "arbitrator") == 0) {
 			if (add_site(val, ARBITRATOR))
 				goto out;
 			continue;
 		}
 
 		if (strcmp(key, "site-user") == 0) {
 			safe_copy(booth_conf->site_user, optarg, BOOTH_NAME_LEN,
 					"site-user");
 			continue;
 		}
 		if (strcmp(key, "site-group") == 0) {
 			safe_copy(booth_conf->site_group, optarg, BOOTH_NAME_LEN,
 					"site-group");
 			continue;
 		}
 		if (strcmp(key, "arbitrator-user") == 0) {
 			safe_copy(booth_conf->arb_user, optarg, BOOTH_NAME_LEN,
 					"arbitrator-user");
 			continue;
 		}
 		if (strcmp(key, "arbitrator-group") == 0) {
 			safe_copy(booth_conf->arb_group, optarg, BOOTH_NAME_LEN,
 					"arbitrator-group");
 			continue;
 		}
 
 		if (strcmp(key, "debug") == 0) {
 			if (type != CLIENT)
 				debug_level = max(debug_level, atoi(val));
 			continue;
 		}
 
 		if (strcmp(key, "ticket") == 0) {
 			if (current_tk && strcmp(current_tk->name, "__defaults__")) {
 				if (!postproc_ticket(current_tk)) {
 					goto out;
 				}
 			}
 			if (!strcmp(val, "__defaults__")) {
 				current_tk = &defaults;
 			} else if (add_ticket(val, &current_tk, &defaults)) {
 				goto out;
 			}
 			continue;
 		}
 
 		/* current_tk must be allocated at this point, otherwise
 		 * we don't know to which ticket the key refers
 		 */
 		if (!current_tk) {
 			error = "Unexpected keyword";
 			goto err;
 		}
 
 		if (strcmp(key, "expire") == 0) {
 			current_tk->term_duration = read_time(val);
 			if (current_tk->term_duration <= 0) {
 				error = "Expected time >0 for expire";
 				goto err;
 			}
 			continue;
 		}
 
 		if (strcmp(key, "timeout") == 0) {
 			current_tk->timeout = read_time(val);
 			if (current_tk->timeout <= 0) {
 				error = "Expected time >0 for timeout";
 				goto err;
 			}
 			if (!min_timeout) {
 				min_timeout = current_tk->timeout;
 			} else {
 				min_timeout = min(min_timeout, current_tk->timeout);
 			}
 			continue;
 		}
 
 		if (strcmp(key, "retries") == 0) {
 			current_tk->retries = strtol(val, &s, 0);
 			if (*s || s == val ||
 					current_tk->retries<3 || current_tk->retries > 100) {
 				error = "Expected plain integer value in the range [3, 100] for retries";
 				goto err;
 			}
 			continue;
 		}
 
 		if (strcmp(key, "renewal-freq") == 0) {
 			current_tk->renewal_freq = read_time(val);
 			if (current_tk->renewal_freq <= 0) {
 				error = "Expected time >0 for renewal-freq";
 				goto err;
 			}
 			continue;
 		}
 
 		if (strcmp(key, "acquire-after") == 0) {
 			current_tk->acquire_after = read_time(val);
 			if (current_tk->acquire_after < 0) {
 				error = "Expected time >=0 for acquire-after";
 				goto err;
 			}
 			continue;
 		}
 
 		if (strcmp(key, "before-acquire-handler") == 0) {
 			if (parse_extprog(val, current_tk)) {
 				goto err;
 			}
 			continue;
 		}
 
 		if (strcmp(key, "weights") == 0) {
 			if (parse_weights(val, current_tk->weight) < 0)
 				goto out;
 			continue;
 		}
 
 		error = "Unknown keyword";
 		goto err;
 	}
 
 	if ((booth_conf->site_count % 2) == 0) {
 		log_warn("Odd number of nodes is strongly recommended!");
 	}
 
 	/* Default: make config name match config filename. */
 	if (!booth_conf->name[0]) {
 		cp = strrchr(path, '/');
 		cp = cp ? cp+1 : (char *)path;
 		cp2 = strrchr(cp, '.');
 		if (!cp2)
 			cp2 = cp + strlen(cp);
 		if (cp2-cp >= BOOTH_NAME_LEN) {
 			log_error("booth config file name too long");
 			goto err;
 		}
 		strncpy(booth_conf->name, cp, cp2-cp);
 		*(booth_conf->name+(cp2-cp)) = '\0';
 	}
 
 	if (!postproc_ticket(current_tk)) {
 		goto out;
 	}
 
 	poll_timeout = min(POLL_TIMEOUT, min_timeout/10);
+	if (!poll_timeout)
+		poll_timeout = POLL_TIMEOUT;
+
 	return 0;
 
 
 err:
 out:
 	log_error("%s in config file line %d",
 			error, lineno);
 
 	free(booth_conf);
 	booth_conf = NULL;
 	return -1;
 }
 
 
 int check_config(int type)
 {
 	struct passwd *pw;
 	struct group *gr;
 	char *cp, *input;
 
 	if (!booth_conf)
 		return -1;
 
 
 	input = (type == ARBITRATOR)
 		? booth_conf->arb_user
 		: booth_conf->site_user;
 	if (!*input)
 		goto u_inval;
 	if (isdigit(input[0])) {
 		booth_conf->uid = strtol(input, &cp, 0);
 		if (*cp != 0) {
 u_inval:
 			log_error("User \"%s\" cannot be resolved into a UID.", input);
 			return ENOENT;
 		}
 	}
 	else {
 		pw = getpwnam(input);
 		if (!pw)
 			goto u_inval;
 		booth_conf->uid = pw->pw_uid;
 	}
 
 
 	input = (type == ARBITRATOR)
 		? booth_conf->arb_group
 		: booth_conf->site_group;
 	if (!*input)
 		goto g_inval;
 	if (isdigit(input[0])) {
 		booth_conf->gid = strtol(input, &cp, 0);
 		if (*cp != 0) {
 g_inval:
 			log_error("Group \"%s\" cannot be resolved into a UID.", input);
 			return ENOENT;
 		}
 	}
 	else {
 		gr = getgrnam(input);
 		if (!gr)
 			goto g_inval;
 		booth_conf->gid = gr->gr_gid;
 	}
 
 
 	/* TODO: check whether uid or gid is 0 again?
 	 * The admin may shoot himself in the foot, though. */
 
 	return 0;
 }
 
 
 int find_site_by_name(unsigned char *site, struct booth_site **node, int any_type)
 {
 	struct booth_site *n;
 	int i;
 
 	if (!booth_conf)
 		return 0;
 
 	for (i = 0; i < booth_conf->site_count; i++) {
 		n = booth_conf->site + i;
 		if ((n->type == SITE || any_type) &&
 		    strcmp(n->addr_string, site) == 0) {
 			*node = n;
 			return 1;
 		}
 	}
 
 	return 0;
 }
 
 int find_site_by_id(uint32_t site_id, struct booth_site **node)
 {
 	struct booth_site *n;
 	int i;
 
 	if (site_id == NO_ONE) {
 		*node = no_leader;
 		return 1;
 	}
 
 	if (!booth_conf)
 		return 0;
 
 	for (i = 0; i < booth_conf->site_count; i++) {
 		n = booth_conf->site + i;
 		if (n->site_id == site_id) {
 			*node = n;
 			return 1;
 		}
 	}
 
 	return 0;
 }
 
 
 
 const char *type_to_string(int type)
 {
 	switch (type)
 	{
 		case ARBITRATOR: return "arbitrator";
 		case SITE:       return "site";
 		case CLIENT:     return "client";
 	}
 	return "??invalid-type??";
 }