diff --git a/.gitarchivever b/.gitarchivever
new file mode 100644
index 0000000..37b24fb
--- /dev/null
+++ b/.gitarchivever
@@ -0,0 +1 @@
+ref names:$Format:%d$
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..2e36fe7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.gitarchivever export-subst
diff --git a/.gitignore b/.gitignore
index 0d20fce..c763b4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,52 @@
 Makefile.in
 Makefile
 compile
 autom4te.cache
 aclocal.m4
 config.guess
 config.status
 config.sub
 configure
 depcomp
 install-sh
 missing
 test-driver
 *.trs
 *.log
 *.rpm
 *.o
 .deps
+.version
 .dirstamp
 
 booth-*.tar*
 
 conf/booth*.service
 docs/*.8
 script/service-runnable
 script/unit-test.py
 src/b_config.h.in
 src/b_config.h
 src/booth_config.h
 src/boothd
 src/stamp-h1
 src/stamp-h2
 test/boothtestenv.py
 test/runtests.py
 
 # cscope files
 cscope.*
 ncscope.*
 
 # ctags files
 tags
 
 # vim temp files
 .*.sw?
 *~
 
 # test suite random files
 *.pyc
 __pycache__
 
 cov*
diff --git a/Makefile.am b/Makefile.am
index 9de39bc..ce98e56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,205 +1,211 @@
 # Copyright (c) 2009 Red Hat, Inc.
 #
 # Authors: Andrew Beekhof
 #	   Steven Dake (sdake@redhat.com)
 #
 # This software licensed under BSD license, the text of which follows:
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
 # - Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # - Redistributions in binary form must reproduce the above copyright notice,
 #   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
 # - Neither the name of the MontaVista Software, Inc. nor the names of its
 #   contributors may be used to endorse or promote products derived from this
 #   software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 SPEC			= $(PACKAGE_NAME).spec
 
 TARFILE			= $(PACKAGE_NAME)-$(VERSION).tar.gz
 
 EXTRA_DIST		= autogen.sh conf/booth.conf.example \
 			  script/booth-keygen script/lsb script/ocf script/service-runnable.in \
 			  script/unit-test.py.in script/wireshark-dissector.lua \
 			  test/arbtests.py test/assertions.py test/booth_path test/boothrunner.py \
 			  test/boothtestenv.py.in test/clientenv.py test/clienttests.py test/live_test.sh \
 			  test/runtests.py.in test/serverenv.py test/servertests.py test/sitetests.py \
 			  test/utils.py \
 			  unit-tests \
 			  contrib \
-			  $(SPEC) booth-rpmlintrc
+			  $(SPEC) booth-rpmlintrc \
+			  .version build-aux/git-version-gen
 
 AUTOMAKE_OPTIONS	= foreign
 
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf test_lense.sh \
 			  compile
 
 dist_doc_DATA		= AUTHORS README COPYING README.upgrade-from-v0.1 README-testing
 
 boothconfdir		= ${BOOTHSYSCONFDIR}
 
 boothconf_DATA		= conf/booth.conf.example
 
 boothsitedir		= $(ocfdir)/resource.d/pacemaker
 boothsite_SCRIPTS	= script/ocf/booth-site
 
 boothocfdir		= $(ocfdir)/resource.d/booth
 boothocf_SCRIPTS	= script/ocf/sharedrsc script/ocf/geostore
 
 boothocflibdir		= $(ocfdir)/lib/booth
 boothocflib_DATA	= script/ocf/geo_attr.sh
 
 bootharbitratordir	= ${INITDDIR}
 
 bootharbitrator_SCRIPTS	= script/lsb/booth-arbitrator
 
 boothnoarchdir		= $(datadir)/$(PACKAGE_NAME)
 
 nodist_boothnoarch_SCRIPTS = script/service-runnable
 
 sbin_SCRIPTS		= script/booth-keygen
 
 TESTS			= test/runtests.py
 
 SUBDIRS			= src docs conf
 
 coverity:
 	cov-build --dir=cov make
 	cov-analyze --dir cov --concurrency --wait-for-license
 	cov-format-errors --dir cov
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/${boothconfdir}
 	$(INSTALL) -d $(DESTDIR)/${bootharbitratordir}
 	$(INSTALL) -d $(DESTDIR)/${boothsitedir}
 	$(INSTALL) -d $(DESTDIR)/${boothocfdir}
 	$(INSTALL) -d $(DESTDIR)/${BOOTH_LIB_DIR} -m 750
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/${BOOTH_LIB_DIR} 
 	$(INSTALL) -d $(DESTDIR)/${BOOTH_CORE_DIR} -m 750
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/${BOOTH_CORE_DIR}
 
 install-exec-hook:
 	ln -sf ${sbindir}/boothd $(DESTDIR)/${sbindir}/booth
 	ln -sf ${sbindir}/boothd $(DESTDIR)/${sbindir}/geostore
 
 uninstall-local:
 	rmdir $(DESTDIR)/${boothconfdir} || :;
 	rmdir $(DESTDIR)/${bootharbitratordir} || :;
 	rmdir $(DESTDIR)/${boothsitedir} || :;
 	rmdir $(DESTDIR)/${BOOTH_CORE_DIR} || :;
 	rmdir $(DESTDIR)/${BOOTH_LIB_DIR} || :;
 
 test: check
 
 lint:
 	for dir in src; do make -C $$dir lint; done
 
 clean-local:
 	rm -rf test/*.pyc test/__pycache__ test/runtests.py test/boothtestenv.py cov*
 
 dist-clean-local:
 	rm -f autoconf automake autoheader
 
+# release/versioning
+BUILT_SOURCES = .version
+.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+
 dist-hook:
 	echo $(VERSION) > $(distdir)/.tarball-version
 
 
 test/runtests.py: test/runtests.py.in test/boothtestenv.py
 	rm -f $@-t $@
 	mkdir -p ${abs_top_builddir}/test
 	sed \
 	    -e 's#PYTHON_SHEBANG#${PYTHON_SHEBANG}#g' \
 	    -e 's#TEST_SRC_DIR#${abs_top_srcdir}/test#g' \
 	    -e 's#TEST_BUILD_DIR#${abs_top_builddir}/test#g' \
 		$< > $@-t;
 	chmod a-w $@-t
 	chmod u+x $@-t
 	mv $@-t $@
 
 test/boothtestenv.py: test/boothtestenv.py.in
 	rm -f $@-t $@
 	mkdir -p ${abs_top_builddir}/test
 	sed \
 	    -e 's#TEST_SRC_DIR#${abs_top_srcdir}/test#g' \
 	    -e 's#TEST_BUILD_DIR#${abs_top_builddir}/test#g' \
 		$< > $@-t;
 	chmod a-w $@-t
 	mv $@-t $@
 
 ## make rpm/srpm section.
 
 $(SPEC):
 	rm -f $@-t $@
 	date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
 	if [ -f .tarball-version ]; then \
 		gitver="$(shell cat .tarball-version)" && \
 		rpmver=$$gitver && \
 		alphatag="" && \
 		dirty="" && \
 		numcomm="0"; \
 	else \
 		gitver="$(shell git describe --tags --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
 		rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
 		alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \
 		vtag=`echo $$gitver | sed -e "s/-.*//g"` && \
 		numcomm=`git rev-list $$vtag..HEAD | wc -l` && \
 		git update-index --refresh > /dev/null 2>&1 || true && \
 		dirty=`git diff-index --name-only HEAD 2>/dev/null`; \
 	fi && \
 	if [ -n "$$dirty" ]; then dirty="dirty"; else dirty=""; fi && \
 	if [ "$$numcomm" = "0" ]; then \
 		sed \
 			-e "s#@version@#$$rpmver#g" \
 			-e "s#%glo.*alpha.*##g" \
 			-e "s#%glo.*numcomm.*##g" \
 			-e "s#@dirty@#$$dirty#g" \
 			-e "s#@date@#$$date#g" \
 		$< > $@-t; \
 	else \
 		sed \
 			-e "s#@version@#$$rpmver#g" \
 			-e "s#@alphatag@#$$alphatag#g" \
 			-e "s#@numcomm@#$$numcomm#g" \
 			-e "s#@dirty@#$$dirty#g" \
 			-e "s#@date@#$$date#g" \
 		$< > $@-t; \
 	fi; \
 	if [ -z "$$dirty" ]; then sed -i -e "s#%glo.*dirty.*##g" $@-t; fi
 	chmod a-w $@-t
 	mv $@-t $@
 
 $(TARFILE):
 	$(MAKE) dist
 
 RPMBUILDOPTS	= --define "_sourcedir $(abs_builddir)" \
 		  --define "_specdir $(abs_builddir)" \
 		  --define "_builddir $(abs_builddir)" \
 		  --define "_srcrpmdir $(abs_builddir)" \
 		  --define "_rpmdir $(abs_builddir)"
 
 srpm: clean
 	autoreconf -if
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
 
 rpm: clean
 	autoreconf -if
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(WITH_LIST) $(RPMBUILDOPTS) -ba $(SPEC)
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
new file mode 100755
index 0000000..ff0c534
--- /dev/null
+++ b/build-aux/git-version-gen
@@ -0,0 +1,265 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2018-08-31.20; # UTC
+
+# Copyright (C) 2012-2020 Red Hat, Inc.
+# Copyright (C) 2007-2016 Free Software Foundation, Inc.
+#
+# 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+#   produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+#   presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+#   Delete this file prior to any autoconf run where you want to rebuild
+#   files to pick up a version string change; and leave it stale to
+#   minimize rebuild time after unrelated changes to configure sources.
+#
+# As with any generated file in a VC'd directory, you should add
+# /.version to .gitignore, so that you don't accidentally commit it.
+# .tarball-version is never generated in a VC'd directory, so needn't
+# be listed there.
+#
+# In order to use git archive versions another two files has to be presented:
+#
+# .gitarchive-version - present in checked-out repository and git
+#   archive tarball, but not in the distribution tarball. Used as a last
+#   option for version. File must contain special string $Format:%d$,
+#   which is substitued by git on archive operation.
+#
+# .gitattributes - present in checked-out repository and git archive
+#   tarball, but not in the distribution tarball. Must set export-subst
+#   attribute for .gitarchive-version file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+#         [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .version and
+# .tarball-version will exist in distribution tarballs.
+#
+# EXTRA_DIST = $(top_srcdir)/.version
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+#	echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+#	echo $(VERSION) > $(distdir)/.tarball-version
+
+
+me=$0
+
+version="git-version-gen $scriptversion
+
+Copyright 2011 Free Software Foundation, Inc.
+There is NO warranty.  You may redistribute this software
+under the terms of the GNU General Public License.
+For more information about these matters, see the files named COPYING."
+
+usage="\
+Usage: $me [OPTION]... \$srcdir/.tarball-version [\$srcdir/.gitarchive-version] [TAG-NORMALIZATION-SED-SCRIPT]
+Print a version string.
+
+Options:
+
+   --prefix PREFIX    prefix of git tags (default 'v')
+   --fallback VERSION
+                      fallback version to use if \"git --version\" fails
+
+   --help             display this help and exit
+   --version          output version information and exit
+
+Running without arguments will suffice in most cases."
+
+prefix=v
+fallback=
+
+while test $# -gt 0; do
+  case $1 in
+    --help) echo "$usage"; exit 0;;
+    --version) echo "$version"; exit 0;;
+    --prefix) shift; prefix="$1";;
+    --fallback) shift; fallback="$1";;
+    -*)
+      echo "$0: Unknown option '$1'." >&2
+      echo "$0: Try '--help' for more information." >&2
+      exit 1;;
+    *)
+      if test "x$tarball_version_file" = x; then
+        tarball_version_file="$1"
+      elif test "x$gitarchive_version_file" = x; then
+        gitarchive_version_file="$1"
+      elif test "x$tag_sed_script" = x; then
+        tag_sed_script="$1"
+      else
+        echo "$0: extra non-option argument '$1'." >&2
+        exit 1
+      fi;;
+  esac
+  shift
+done
+
+if test "x$tarball_version_file" = x; then
+    echo "$usage"
+    exit 1
+fi
+
+tag_sed_script="${tag_sed_script:-s/x/x/}"
+
+nl='
+'
+
+# Avoid meddling by environment variable of the same name.
+v=
+v_from_git=
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+    v=`cat $tarball_version_file` || v=
+    case $v in
+        *$nl*) v= ;; # reject multi-line output
+        [0-9]*) ;;
+        *) v= ;;
+    esac
+    test "x$v" = x \
+        && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
+fi
+
+if test "x$v" != x
+then
+    : # use $v
+# Otherwise, if there is at least one git commit involving the working
+# directory, and "git describe" output looks sensible, use that to
+# derive a version string.
+elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
+    && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
+          || git describe --abbrev=4 HEAD 2>/dev/null` \
+    && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
+    && case $v in
+         $prefix[0-9]*) ;;
+         *) (exit 1) ;;
+       esac
+then
+    # Is this a new git that lists number of commits since the last
+    # tag or the previous older version that did not?
+    #   Newer: v6.10-77-g0f8faeb
+    #   Older: v6.10-g0f8faeb
+    case $v in
+        *-*-*) : git describe is okay three part flavor ;;
+        *-*)
+            : git describe is older two part flavor
+            # Recreate the number of commits and rewrite such that the
+            # result is the same as if we were using the newer version
+            # of git describe.
+            vtag=`echo "$v" | sed 's/-.*//'`
+            commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
+                || { commit_list=failed;
+                     echo "$0: WARNING: git rev-list failed" 1>&2; }
+            numcommits=`echo "$commit_list" | wc -l`
+            v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+            test "$commit_list" = failed && v=UNKNOWN
+            ;;
+    esac
+
+    # Change the first '-' to a '.', so version-comparing tools work properly.
+    # Remove the "g" in git describe's output string, to save a byte.
+    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+    v_from_git=1
+elif test "x$fallback" = x || git --version >/dev/null 2>&1; then
+    if test -f $gitarchive_version_file
+    then
+        v=`sed "s/^.*tag: \($prefix[0-9)][^,)]*\).*\$/\1/" $gitarchive_version_file \
+            | sed "$tag_sed_script"` || exit 1
+        case $v in
+            *$nl*) v= ;; # reject multi-line output
+            $prefix[0-9]*) ;;
+            *) v= ;;
+        esac
+
+        test -z "$v" \
+            && echo "$0: WARNING: $gitarchive_version_file doesn't contain valid version tag" 1>&2 \
+            && v=UNKNOWN
+    elif test "x$fallback" = x; then
+        v=UNKNOWN
+    else
+        v=$fallback
+    fi
+else
+    v=$fallback
+fi
+
+if test "x$fallback" = x -a "$v" = "UNKNOWN"
+then
+  echo "$0: ERROR: Can't find valid version. Please use valid git repository," \
+    "released tarball or version tagged archive" 1>&2
+
+  exit 1
+fi
+
+v=`echo "$v" |sed "s/^$prefix//"`
+
+# Test whether to append the "-dirty" suffix only if the version
+# string we're using came from git.  I.e., skip the test if it's "UNKNOWN"
+# or if it came from .tarball-version.
+if test "x$v_from_git" != x; then
+  # Don't declare a version "dirty" merely because a time stamp has changed.
+  git update-index --refresh > /dev/null 2>&1
+
+  dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
+  case "$dirty" in
+      '') ;;
+      *) # Append the suffix only if there isn't one already.
+          case $v in
+            *-dirty) ;;
+            *) v="$v-dirty" ;;
+          esac ;;
+  esac
+fi
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+printf %s "$v"
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/configure.ac b/configure.ac
index 6b8c982..d5415a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,537 +1,528 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 # bootstrap / init
 AC_PREREQ([2.61])
 
-AC_INIT([booth], [1.0], [users@clusterlabs.org])
+AC_INIT([booth],
+    m4_esyscmd([build-aux/git-version-gen --fallback 1.0 .tarball-version .gitarchivever]),
+    [users@clusterlabs.org])
 
 AC_USE_SYSTEM_EXTENSIONS
 
 AM_INIT_AUTOMAKE([-Wno-portability subdir-objects])
 
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADER([src/b_config.h src/booth_config.h])
 
 AC_CANONICAL_HOST
 
 AC_LANG([C])
 
 AC_SUBST(WITH_LIST, [""])
 
 dnl Fix default variables - "prefix" variable if not specified
 if test "$prefix" = "NONE"; then
 	prefix="/usr"
 
 	dnl Fix "localstatedir" variable if not specified
 	if test "$localstatedir" = "\${prefix}/var"; then
 		localstatedir="/var"
 	fi
 	dnl Fix "sysconfdir" variable if not specified
 	if test "$sysconfdir" = "\${prefix}/etc"; then
 		sysconfdir="/etc"
 	fi
 	dnl Fix "libdir" variable if not specified
 	if test "$libdir" = "\${exec_prefix}/lib"; then
 		if test -e /usr/lib64; then
 			libdir="/usr/lib64"
 		else
 			libdir="/usr/lib"
 		fi
 	fi
 fi
 
 if test "x${prefix}" != "x/usr"; then
 	ocfdir="${prefix}/usr/lib/ocf"
 else
 	ocfdir="${prefix}/lib/ocf"
 fi
 AC_SUBST([ocfdir])
 
 if test "$srcdir" = "."; then
 	AC_MSG_NOTICE([building in place srcdir:$srcdir])
 	AC_DEFINE([BUILDING_IN_PLACE], 1, [building in place])
 else
 	AC_MSG_NOTICE([building out of tree srcdir:$srcdir])
 fi
 
 # Checks for programs.
 
 # check stolen from gnulib/m4/gnu-make.m4
 if ! ${MAKE-make} --version /cannot/make/this >/dev/null 2>&1; then
 	AC_MSG_ERROR([you don't seem to have GNU make; it is required])
 fi
 
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
 AC_PATH_PROGS(PKGCONFIG, pkg-config)
 AC_PATH_PROGS(ASCIIDOC, asciidoc)
 AC_PATH_PROGS(ASCIIDOCTOR, asciidoctor)
 AC_PATH_PROGS(A2X, a2x)
 
 AM_CONDITIONAL(IS_ASCIIDOC, test x"${ASCIIDOC}" != x"")
 AM_CONDITIONAL(IS_A2X, test x"${A2X}" != x"")
 AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${A2X}" != x"" || test x"${ASCIIDOCTOR}" != x"")
 
 # libgcrypt or mhash for hmac
 libgcrypt_installed="yes"
 AC_CHECK_HEADERS(gcrypt.h, , [libgcrypt_installed="no"],)
 AC_CHECK_LIB(gcrypt, gcry_md_open, , [libgcrypt_installed="no"])
 AM_CONDITIONAL(BUILD_AUTH_C, test "x${libgcrypt_installed}" = "xyes")
 
 if test "x$libgcrypt_installed" = "xno"; then
 	mhash_installed="yes"
 	AC_CHECK_HEADERS(mhash.h, , [mhash_installed="no"],)
 	AC_CHECK_LIB(mhash, mhash_init, , [mhash_installed="no"])
 	AM_CONDITIONAL(BUILD_AUTH_C, test "x${mhash_installed}" = "xyes")
 fi
 
 AC_CHECK_LIB([xml2], xmlReadDoc)
 PKG_CHECK_MODULES(XML, [libxml-2.0])
 PKG_CHECK_MODULES(GLIB, [glib-2.0])
 PKG_CHECK_MODULES([PCMK], [pacemaker-service],,
 		  [PKG_CHECK_MODULES([PCMK], [pcmk-service])])
 
 # Python casing, prefer 3.3+ to 2.{6...}
 if test "x$PYTHON" = "x"; then
 	AM_PATH_PYTHON([3.3],, [AM_PATH_PYTHON([2.6])])
 else
 	# Just set Automake variables (mainly PYTHON_VERSION)
 	AM_PATH_PYTHON
 fi
 PYTHON_SHEBANG="$PYTHON ${PYTHON_OPTS--Es}"
 AC_SUBST([PYTHON_SHEBANG])
 
 # Checks for header files.
 AC_FUNC_ALLOCA
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h \
 		  stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h \
 		  sys/time.h syslog.h unistd.h sys/types.h getopt.h malloc.h \
 		  sys/sockio.h utmpx.h])
 AC_CHECK_HEADERS(heartbeat/glue_config.h)
 AC_CHECK_HEADERS(mhash.h)
 AC_CHECK_HEADER([zlib.h],
 		[AC_SUBST(ZLIB_LIBS, ["-lz"])],
 		[AC_MSG_ERROR([zlib development files required])])
 saved_CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${PCMK_CFLAGS} ${GLIB_CFLAGS}"
 AC_CHECK_HEADER([crm/services.h], [],
 		[AC_MSG_ERROR([crm/services.h header required])])
 CPPFLAGS="${saved_CPPFLAGS}"
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_UID_T
 AC_C_INLINE
 AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T
 AC_TYPE_INT8_T
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_HEADER_TIME
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 AC_C_VOLATILE
 
 # Checks for library functions.
 AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_ERROR_AT_LINE
 AC_REPLACE_FNMATCH
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
 AC_FUNC_REALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fcntl \
 		getcwd getpeerucred getpeereid gettimeofday inet_ntoa memmove \
 		memset mkdir scandir select socket strcasecmp strchr strdup \
 		strerror strrchr strspn strstr \
 		sched_get_priority_max sched_setscheduler])
 
 AC_CONFIG_FILES([Makefile
 		 src/Makefile
 		 docs/Makefile
 		 conf/Makefile])
 AC_CONFIG_FILES([conf/booth-arbitrator.service conf/booth@.service])
 AC_CONFIG_FILES([script/unit-test.py])
 AC_CONFIG_FILES([script/service-runnable], [chmod +x script/service-runnable])
 
 # ===============================================
 # Helpers
 # ===============================================
 
 ## helper for CC stuff
 cc_supports_flag() {
          local CFLAGS="-Werror $@"
          AC_MSG_CHECKING(whether $CC supports "$@")
          AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int main(){return 0;}]])],
            [RC=0; AC_MSG_RESULT(yes)],[RC=1; AC_MSG_RESULT(no)])
          return $RC
 }
 
 ## extract header or define
 try_extract_header_define() {
 	  AC_MSG_CHECKING(if $2 in $1 exists)
 	  Cfile=$srcdir/extract_define.$2.${$}
 	  printf "#include <stdio.h>\n" > ${Cfile}.c
 	  printf "#include <%s>\n" $1 >> ${Cfile}.c
 	  printf "int main(int argc, char **argv) {\n" >> ${Cfile}.c
 	  printf "#ifdef %s\n" $2 >> ${Cfile}.c
 	  printf "printf(\"%%s\", %s);\n" $2 >> ${Cfile}.c
 	  printf "#endif \n return 0; }\n" >> ${Cfile}.c
 	  $CC $CFLAGS ${Cfile}.c -o ${Cfile} 2>/dev/null
 	  value=
 	  if test -x ${Cfile}; then
 	      value=`${Cfile} 2>/dev/null`
 	  fi
 	  if  test x"${value}" == x""; then
 	      value=$3
 	      AC_MSG_RESULT(default: $value)
 	  else
 	      AC_MSG_RESULT($value)
 	  fi
 	  printf $value
 	  rm -rf ${Cfile}.c ${Cfile} ${Cfile}.dSYM ${Cfile}.gcno
 	}
 
 ## cleanup
 AC_MSG_NOTICE(Sanitizing prefix: ${prefix})
 case $prefix in
   NONE) prefix=/usr/local;;
 esac
 
 AC_MSG_NOTICE(Sanitizing exec_prefix: ${exec_prefix})
 case $exec_prefix in
   dnl For consistency with Corosync, map NONE->$prefix
   NONE)   exec_prefix=$prefix;;
   prefix) exec_prefix=$prefix;;
 esac
 
 ## local defines
 PACKAGE_FEATURES=""
 
 LINT_FLAGS="-weak -unrecog +posixlib +ignoresigns -fcnuse \
 	-badflag -D__gnuc_va_list=va_list -D__attribute\(x\)="
 
 # local options
 
 AC_ARG_ENABLE([fatal-warnings],
 	[  --enable-fatal-warnings         : enable fatal warnings. ],
 	[ default="no" ])
 
 AC_ARG_ENABLE([debug],
 	[  --enable-debug                  : enable debug build. ],
 	[ default="no" ])
 
 AC_ARG_ENABLE([user-flags],
 	[  --enable-user-flags             : rely on user environment. ],
 	[ default="no" ])
 
 AC_ARG_ENABLE([coverage],
 	[  --enable-coverage               : coverage analysis of the codebase. ],
 	[ default="no" ])
 
 AC_ARG_WITH([initddir],
 	[  --with-initddir=DIR             : path to init script directory. ],
 	[ INITDDIR="$withval" ],
 	[ INITDDIR="$sysconfdir/init.d" ])
 
-test -s .git_info &&
-	GIT_VER="`cat .git_info`"
-
-AC_ARG_WITH([build-version],
-	[  --with-build-version=STR        : build version ],
-	[ BOOTH_BUILD_VERSION="$withval" ],
-	[ BOOTH_BUILD_VERSION="${GIT_VER:-$PACKAGE_VERSION}" ])
-
 AC_ARG_WITH([html_man],
 	[  --with-html_man                 : Enable generating man pages in HTML.],
 	[with_html_man=yes],
 	[])
 AM_CONDITIONAL(BUILD_ASCIIDOC_HTML_MAN,
 	       (test "x${ASCIIDOC}" != "x" || test x"${ASCIIDOCTOR}" != x"") && test "x$with_html_man" = "xyes")
 
 AC_ARG_WITH([glue],
 	[  --without-glue                  : Avoid libraries from (cluster-)glue project.],
 	[],
 	[with_glue=yes])
 
 # figure out logging provider
 logging_provider=""
 if test "x$logging_provider" = "x" && test "x$with_glue" = "xyes"; then
 	AC_CHECK_LIB([plumb], [cl_log], [logging_provider="libplumb"])
 fi
 if test "x$logging_provider" = "x" && test "x$with_glue" = "xno"; then
 	AC_CHECK_LIB([qb], [qb_log_real_], [logging_provider="libqb"])
 fi
 case "$logging_provider" in
 libplumb)
 	LOGGER="ha_logger"
 	;;
 libqb)
 	PKG_CHECK_MODULES([LIBQB], [libqb])
 	AC_DEFINE([LOGGING_LIBQB], [], [use libqb as a logging provider])
 	PKG_CHECK_MODULES([LIBQB1], [libqb >= 1.0],
 			  [AC_DEFINE([LOGGING_LIBQB_MAJOR], [1],
 				     [libqb major version lower bound])],
 			  [AC_MSG_WARN([[syslog identifier will not get changed]])])
 	LOGGER="logger -t booth-script"
 	;;
 *)
 	AC_MSG_ERROR([logging provider required (libplumb, or libqb when --without-glue)])
 	;;
 esac
 AM_CONDITIONAL([LOGGING_LIBQB], [test "x$logging_provider" = "xlibqb"])
 AC_SUBST([LOGGER])
 
 # figure out range2random provider
 range2random_provider=""
 if test "x$range2random_provider" = "x" && test "x$with_glue" = "xyes"; then
        AC_CHECK_LIB([plumb], [get_next_random], [range2random_provider="libplumb"])
        AC_CHECK_DECL([cl_rand_from_interval], [], [range2random_provider=""],
 		     [#include <clplumbing/cl_random.h>])
 fi
 if test "x$range2random_provider" = "x" && test "x$with_glue" = "xno"; then
        AC_CHECK_LIB([glib-2.0], [g_random_int_range], [range2random_provider="glib"])
 fi
 case "$range2random_provider" in
 libplumb)
 	;;
 glib)
 	PKG_CHECK_MODULES([GLIB], [glib-2.0])
 	AC_DEFINE([RANGE2RANDOM_GLIB], [], [use glib as a range2random provider])
 	;;
 *)
 	AC_MSG_ERROR([range2random provider required (libplumb, or glib when --without-glue)])
 	;;
 esac
 AM_CONDITIONAL([RANGE2RANDOM_GLIB], [test "x$range2random_provider" = "xglib"])
 
 # figure out nametag/distinguished-role provider
 nametag_provider=""
 if test "x$nametag_provider" = "x" && test "x$with_glue" != "xno"; then
 	AC_CHECK_LIB([plumbgpl], [set_proc_title], [nametag_provider="libplumbgpl"])
 fi
 if test "x$nametag_provider" = "x" && test "x$with_glue" = "xno"; then
 	AC_SEARCH_LIBS([sd_notify], [systemd systemd-daemon], [nametag_provider="libsystemd"])
 fi
 NOTIFY_ACCESS_SWITCH='# '
 case "$nametag_provider" in
 libplumbgpl)
 	;;
 libsystemd)
 	PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd],, [
 		PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd-daemon])
 	])
 	AC_DEFINE([NAMETAG_LIBSYSTEMD], [], [use libsystemd as a nametag provider])
 	NOTIFY_ACCESS_SWITCH=
 	;;
 *)
 	AC_MSG_ERROR([nametag provider required (libplumbgpl, or libsystemd when --without-glue)])
 	;;
 esac
 AM_CONDITIONAL([NAMETAG_LIBSYSTEMD], [test "x$nametag_provider" = "xlibsystemd"])
 AC_SUBST([NOTIFY_ACCESS_SWITCH])
 
 # figure out if "coredump nursing" supported and desired
 coredump_nursing="no"
 if test "x$with_glue" != "xno"; then
 	AC_CHECK_LIB([plumb], [cl_enable_coredumps], [coredump_nursing="libplumb"])
 fi
 if test "x$coredump_nursing" != "xno"; then
 	AC_DEFINE(COREDUMP_NURSING, [], [eligible for coredump nursing])
 fi
 AM_CONDITIONAL([COREDUMP_NURSING], [test "x$coredump_nursing" != "xno"])
 
 # define CRM daemon user & group
 CRM_DAEMON_USER=`try_extract_header_define glue_config.h HA_CCMUSER hacluster`
 AC_DEFINE_UNQUOTED(CRM_DAEMON_USER,"$CRM_DAEMON_USER", User to run Booth daemon as)
 AC_SUBST(CRM_DAEMON_USER)
 
 CRM_DAEMON_GROUP=`try_extract_header_define glue_config.h HA_APIGROUP haclient`
 AC_DEFINE_UNQUOTED(CRM_DAEMON_GROUP,"$CRM_DAEMON_GROUP", Group to run Booth daemon as)
 AC_SUBST(CRM_DAEMON_GROUP)
 
 # *FLAGS handling goes here
 
 ENV_CFLAGS="$CFLAGS"
 ENV_CPPFLAGS="$CPPFLAGS"
 ENV_LDFLAGS="$LDFLAGS"
 
 # debug build stuff
 if test "x${enable_debug}" = xyes; then
 	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
 	OPT_CFLAGS="-O0 -U_FORTIFY_SOURCE"
 	PACKAGE_FEATURES="$PACKAGE_FEATURES debug"
 else
 	OPT_CFLAGS="-O3"
 fi
 
 # gdb flags
 if test "x${GCC}" = xyes; then
 	GDB_FLAGS="-ggdb3"
 else
 	GDB_FLAGS="-g"
 fi
 
 dnl Check for POSIX clock_gettime
 dnl
 AC_CACHE_CHECK([have clock_gettime],ac_cv_HAVE_CLOCK_GETTIME,[
 AC_TRY_COMPILE([
 #include <time.h>
 ],
 [ struct timespec tv; clock_gettime(CLOCK_REALTIME, &tv); return 0;],
 ac_cv_HAVE_CLOCK_GETTIME=yes,ac_cv_HAVE_CLOCK_GETTIME=no,ac_cv_HAVE_CLOCK_GETTIME=cross)])
 AM_CONDITIONAL(BUILD_TIMER_C, test x"$ac_cv_HAVE_CLOCK_GETTIME" = x"yes")
 
 # extra warnings
 EXTRA_WARNINGS=""
 
 WARNLIST="
 	all
 	shadow
 	missing-prototypes
 	missing-declarations
 	strict-prototypes
 	declaration-after-statement
 	pointer-arith
 	write-strings
 	bad-function-cast
 	missing-format-attribute
 	format=2
 	format-security
 	format-nonliteral
 	no-long-long
 	unsigned-char
 	gnu89-inline
 	no-strict-aliasing
 	"
 
 for j in $WARNLIST; do
 	if cc_supports_flag -W$j; then
 		EXTRA_WARNINGS="$EXTRA_WARNINGS -W$j";
 	fi
 done
 
 if test "x${enable_coverage}" = xyes && \
 		cc_supports_flag -ftest-coverage && \
 		cc_supports_flag -fprofile-arcs ; then
 	AC_MSG_NOTICE([Enabling Coverage (enable -O0 by default)])
 	OPT_CFLAGS="-O0"
 	COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs"
 	COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
 	PACKAGE_FEATURES="$PACKAGE_FEATURES coverage"
 else
 	COVERAGE_CFLAGS=""
 	COVERAGE_LDFLAGS=""
 fi
 
 
 if test "x${enable_ansi}" = xyes && \
 		cc_supports_flag -std=iso9899:199409 ; then
 	AC_MSG_NOTICE([Enabling ANSI Compatibility])
 	ANSI_CPPFLAGS="-ansi -D_GNU_SOURCE -DANSI_ONLY"
 	PACKAGE_FEATURES="$PACKAGE_FEATURES ansi"
 else
 	ANSI_CPPFLAGS=""
 fi
 
 if test "x${enable_fatal_warnings}" = xyes && \
 		cc_supports_flag -Werror ; then
 	AC_MSG_NOTICE([Enabling Fatal Warnings (-Werror)])
 	WERROR_CFLAGS="-Werror"
 	PACKAGE_FEATURES="$PACKAGE_FEATURES fatal-warnings"
 else
 	WERROR_CFLAGS=""
 fi
 
 # don't add addtional cflags
 if test "x${enable_user_flags}" = xyes; then
   OPT_CFLAGS=""
   GDB_FLAGS=""
   EXTRA_WARNINGS=""
 fi
 
 # final build of *FLAGS
 CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
 	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
 CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS $GLIB_CFLAGS $RESMON_CFLAGS $XML_CFLAGS"
 LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
 LIBS="$LIBS $XML_LIBS"
 
 # substitute what we need:
 AC_SUBST([INITDDIR])
 
 AC_SUBST([LINT_FLAGS])
 
 BOOTH_LIB_DIR=${localstatedir}/lib/booth
 BOOTH_CORE_DIR=${localstatedir}/lib/booth/cores
 BOOTHSYSCONFDIR=${sysconfdir}/booth
 
 AC_SUBST([HAVE_LOG_CIB_DIFF])
 AC_SUBST([HAVE_XML_LOG_PATCHSET])
 AC_SUBST([BOOTH_LIB_DIR])
 AC_SUBST([BOOTH_CORE_DIR])
 AC_SUBST([BOOTHSYSCONFDIR])
-AC_SUBST([BOOTH_BUILD_VERSION])
 
 AC_DEFINE_UNQUOTED([BOOTH_LIB_DIR], "$(eval echo ${BOOTH_LIB_DIR})", [booth lib directory])
 AC_DEFINE_UNQUOTED([BOOTH_CORE_DIR], "$(eval echo ${BOOTH_CORE_DIR})", [booth working directory])
 AC_DEFINE_UNQUOTED([BOOTHSYSCONFDIR], "$(eval echo ${BOOTHSYSCONFDIR})", [booth config directory])
 
 AC_DEFINE_UNQUOTED([PACKAGE_FEATURES], "${PACKAGE_FEATURES}", [booth built-in features])
 
-AC_DEFINE_UNQUOTED([BOOTH_BUILD_VERSION], "${BOOTH_BUILD_VERSION}", [booth build version])
-
 AC_OUTPUT
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE configuration:])
-AC_MSG_RESULT([  Version                  = ${VERSION} (Build: ${BOOTH_BUILD_VERSION})])
+AC_MSG_RESULT([  Version                  = ${VERSION}])
 AC_MSG_RESULT([  Prefix                   = ${prefix}])
 AC_MSG_RESULT([  Executables              = ${sbindir}])
 AC_MSG_RESULT([  Man pages                = ${mandir}])
 AC_MSG_RESULT([  Doc dir                  = ${docdir}])
 AC_MSG_RESULT([  Libraries                = ${libdir}])
 AC_MSG_RESULT([  Header files             = ${includedir}])
 AC_MSG_RESULT([  Arch-independent files   = ${datadir}])
 AC_MSG_RESULT([  State information        = ${localstatedir}])
 AC_MSG_RESULT([  System configuration     = ${sysconfdir}])
 AC_MSG_RESULT([  System init.d directory  = ${INITDDIR}])
 AC_MSG_RESULT([  booth config dir         = ${BOOTHSYSCONFDIR}])
 AC_MSG_RESULT([  Features                 = ${PACKAGE_FEATURES}])
 AC_MSG_RESULT([  Logging provider         = ${logging_provider}])
 AC_MSG_RESULT([  Range2random provider    = ${range2random_provider}])
 AC_MSG_RESULT([  Nametag provider         = ${nametag_provider}])
 AC_MSG_RESULT([  Coredump nursing         = ${coredump_nursing}])
 AC_MSG_RESULT([  Working directory        = ${BOOTH_CORE_DIR}])
 AC_MSG_RESULT([  HA group name            = ${CRM_DAEMON_GROUP}])
 AC_MSG_RESULT([  HA user name             = ${CRM_DAEMON_USER}])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE build info:])
 AC_MSG_RESULT([  Default optimization     = ${OPT_CFLAGS}])
 AC_MSG_RESULT([  Default debug options    = ${GDB_CFLAGS}])
 AC_MSG_RESULT([  Extra compiler warnings  = ${EXTRA_WARNING}])
 AC_MSG_RESULT([  Env. defined CFLAG       = ${ENV_CFLAGS}])
 AC_MSG_RESULT([  Env. defined CPPFLAGS    = ${ENV_CPPFLAGS}])
 AC_MSG_RESULT([  Env. defined LDFLAGS     = ${ENV_LDFLAGS}])
 AC_MSG_RESULT([  ANSI defined CPPFLAGS    = ${ANSI_CPPFLAGS}])
 AC_MSG_RESULT([  Coverage     CFLAGS      = ${COVERAGE_CFLAGS}])
 AC_MSG_RESULT([  Coverage     LDFLAGS     = ${COVERAGE_LDFLAGS}])
 AC_MSG_RESULT([  Fatal War.   CFLAGS      = ${WERROR_CFLAGS}])
 AC_MSG_RESULT([  Final        CFLAGS      = ${CFLAGS}])
 AC_MSG_RESULT([  Final        CPPFLAGS    = ${CPPFLAGS}])
 AC_MSG_RESULT([  Final        LDFLAGS     = ${LDFLAGS}])
diff --git a/src/main.c b/src/main.c
index 904d4e5..7e400cc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,1637 +1,1636 @@
 /* 
  * 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 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 program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "b_config.h"
 
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sched.h>
 #include <errno.h>
 #include <limits.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/poll.h>
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <signal.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 
 #include <crm/services.h>
 
 #if HAVE_LIBGCRYPT
 #include <gcrypt.h>
 #endif
 #ifndef NAMETAG_LIBSYSTEMD
 #include <clplumbing/setproctitle.h>
 #else
 #include "alt/nametag_libsystemd.h"
 #endif
 #ifdef COREDUMP_NURSING
 #include <sys/prctl.h>
 #include <clplumbing/coredumps.h>
 #endif
 #include "log.h"
 #include "booth.h"
 #include "config.h"
 #include "transport.h"
 #include "inline-fn.h"
 #include "pacemaker.h"
 #include "ticket.h"
 #include "request.h"
 #include "attr.h"
 #include "handler.h"
 
-#define RELEASE_VERSION		"1.0"
-#define RELEASE_STR 	RELEASE_VERSION " (build " BOOTH_BUILD_VERSION ")"
+#define RELEASE_STR 	VERSION
 
 #define CLIENT_NALLOC		32
 
 static int daemonize = 1;
 int enable_stderr = 0;
 timetype start_time;
 
 
 /** Structure for "clients".
  * Filehandles with incoming data get registered here (and in pollfds),
  * along with their callbacks.
  * Because these can be reallocated with every new fd, addressing
  * happens _only_ by their numeric index. */
 struct client *clients = NULL;
 struct pollfd *pollfds = NULL;
 static int client_maxi;
 static int client_size = 0;
 
 
 static const struct booth_site _no_leader = {
 	.addr_string = "none",
 	.site_id = NO_ONE,
 	.index = -1,
 };
 struct booth_site *const no_leader = (struct booth_site*) &_no_leader;
 
 typedef enum
 {
 	BOOTHD_STARTED=0,
 	BOOTHD_STARTING
 } BOOTH_DAEMON_STATE;
 
 int poll_timeout;
 
 
 
 struct booth_config *booth_conf;
 struct command_line cl;
 
 static void client_alloc(void)
 {
 	int i;
 
 	if (!(clients = realloc(
 		clients, (client_size + CLIENT_NALLOC) * sizeof(*clients))
 	) || !(pollfds = realloc(
 		pollfds, (client_size + CLIENT_NALLOC) * sizeof(*pollfds))
 	)) {
 		log_error("can't alloc for client array");
 		exit(1);
 	}
 
 	for (i = client_size; i < client_size + CLIENT_NALLOC; i++) {
 		clients[i].workfn = NULL;
 		clients[i].deadfn = NULL;
 		clients[i].fd = -1;
 		pollfds[i].fd = -1;
 		pollfds[i].revents = 0;
 	}
 	client_size += CLIENT_NALLOC;
 }
 
 static void client_dead(int ci)
 {
 	struct client *c = clients + ci;
 
 	if (c->fd != -1) {
 		log_debug("removing client %d", c->fd);
 		close(c->fd);
 	}
 
 	c->fd = -1;
 	c->workfn = NULL;
 
 	if (c->msg) {
 		free(c->msg);
 		c->msg = NULL;
 		c->offset = 0;
 	}
 
 	pollfds[ci].fd = -1;
 }
 
 int client_add(int fd, const struct booth_transport *tpt,
 		void (*workfn)(int ci),
 		void (*deadfn)(int ci))
 {
 	int i;
 	struct client *c;
 
 
 	if (client_size - 1 <= client_maxi ) {
 		client_alloc();
 	}
 
 	for (i = 0; i < client_size; i++) {
 		c = clients + i;
 		if (c->fd != -1)
 			continue;
 
 		c->workfn = workfn;
 		if (deadfn)
 			c->deadfn = deadfn;
 		else
 			c->deadfn = client_dead;
 
 		c->transport = tpt;
 		c->fd = fd;
 		c->msg = NULL;
 		c->offset = 0;
 
 		pollfds[i].fd = fd;
 		pollfds[i].events = POLLIN;
 		if (i > client_maxi)
 			client_maxi = i;
 
 		return i;
 	}
 
 	assert(!"no client");
 }
 
 int find_client_by_fd(int fd)
 {
 	int i;
 
 	if (fd < 0)
 		return -1;
 
 	for (i = 0; i <= client_maxi; i++) {
 		if (clients[i].fd == fd)
 			return i;
 	}
 	return -1;
 }
 
 static int format_peers(char **pdata, unsigned int *len)
 {
 	struct booth_site *s;
 	char *data, *cp;
 	char time_str[64];
 	int i, alloc;
 
 	*pdata = NULL;
 	*len = 0;
 
 	alloc = booth_conf->site_count * (BOOTH_NAME_LEN + 256);
 	data = malloc(alloc);
 	if (!data)
 		return -ENOMEM;
 
 	cp = data;
 	foreach_node(i, s) {
 		if (s == local)
 			continue;
 		strftime(time_str, sizeof(time_str), "%F %T",
 			localtime(&s->last_recv));
 		cp += snprintf(cp,
 				alloc - (cp - data),
 				"%-12s %s, last recv: %s\n",
 				type_to_string(s->type),
 				s->addr_string,
 				time_str);
 		cp += snprintf(cp,
 				alloc - (cp - data),
 				"\tSent pkts:%u error:%u resends:%u\n",
 				s->sent_cnt,
 				s->sent_err_cnt,
 				s->resend_cnt);
 		cp += snprintf(cp,
 				alloc - (cp - data),
 				"\tRecv pkts:%u error:%u authfail:%u invalid:%u\n\n",
 				s->recv_cnt,
 				s->recv_err_cnt,
 				s->sec_cnt,
 				s->invalid_cnt);
 		if (alloc - (cp - data) <= 0) {
 			free(data);
 			return -ENOMEM;
 		}
 	}
 
 	*pdata = data;
 	*len = cp - data;
 
 	return 0;
 }
 
 
 void list_peers(int fd)
 {
 	char *data;
 	unsigned int olen;
 	struct boothc_hdr_msg hdr;
 
 	if (format_peers(&data, &olen) < 0)
 		goto out;
 
 	init_header(&hdr.header, CL_LIST, 0, 0, RLT_SUCCESS, 0, sizeof(hdr) + olen);
 	(void)send_header_plus(fd, &hdr, data, olen);
 
 out:
 	if (data)
 		free(data);
 }
 
 /* trim trailing spaces if the key is ascii
  */
 static void trim_key()
 {
 	char *p;
 	int i;
 
 	for (i=0, p=booth_conf->authkey; i < booth_conf->authkey_len; i++, p++)
 		if (!isascii(*p))
 			return;
 
 	p = booth_conf->authkey;
 	while (booth_conf->authkey_len > 0 && isspace(*p)) {
 		p++;
 		booth_conf->authkey_len--;
 	}
 	memmove(booth_conf->authkey, p, booth_conf->authkey_len);
 
 	p = booth_conf->authkey + booth_conf->authkey_len - 1;
 	while (booth_conf->authkey_len > 0 && isspace(*p)) {
 		booth_conf->authkey_len--;
 		p--;
 	}
 }
 
 static int read_authkey()
 {
 	int fd;
 
 	booth_conf->authkey[0] = '\0';
 	fd = open(booth_conf->authfile, O_RDONLY);
 	if (fd < 0) {
 		log_error("cannot open %s: %s",
 			booth_conf->authfile, strerror(errno));
 		return -1;
 	}
 	if (fstat(fd, &booth_conf->authstat) < 0) {
 		log_error("cannot stat authentication file %s (%d): %s",
 			booth_conf->authfile, fd, strerror(errno));
 		close(fd);
 		return -1;
 	}
 	if (booth_conf->authstat.st_mode & (S_IRGRP | S_IROTH)) {
 		log_error("%s: file shall not be readable for anyone but the owner",
 			booth_conf->authfile);
 		close(fd);
 		return -1;
 	}
 	booth_conf->authkey_len = read(fd, booth_conf->authkey, BOOTH_MAX_KEY_LEN);
 	close(fd);
 	trim_key();
 	log_debug("read key of size %d in authfile %s",
 		booth_conf->authkey_len, booth_conf->authfile);
 	/* make sure that the key is of minimum length */
 	return (booth_conf->authkey_len >= BOOTH_MIN_KEY_LEN) ? 0 : -1;
 }
 
 int update_authkey()
 {
 	struct stat statbuf;
 
 	if (stat(booth_conf->authfile, &statbuf) < 0) {
 		log_error("cannot stat authentication file %s: %s",
 			booth_conf->authfile, strerror(errno));
 		return -1;
 	}
 	if (statbuf.st_mtime > booth_conf->authstat.st_mtime) {
 		return read_authkey();
 	}
 	return 0;
 }
 
 static int setup_config(int type)
 {
 	int rv;
 
 	rv = read_config(cl.configfile, type);
 	if (rv < 0)
 		goto out;
 
 	if (is_auth_req()) {
 		rv = read_authkey();
 		if (rv < 0)
 			goto out;
 #if HAVE_LIBGCRYPT
 		if (!gcry_check_version(NULL)) {
 			log_error("gcry_check_version");
 			rv = -ENOENT;
 			goto out;
 		}
 		gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 		gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
 	}
 
 	/* Set "local" pointer, ignoring errors. */
 	if (cl.type == DAEMON && cl.site[0]) {
 		if (!find_site_by_name(cl.site, &local, 1)) {
 			log_error("Cannot find \"%s\" in the configuration.",
 					cl.site);
 			return -EINVAL;
 		}
 		local->local = 1;
 	} else
 		find_myself(NULL, type == CLIENT || type == GEOSTORE);
 
 
 	rv = check_config(type);
 	if (rv < 0)
 		goto out;
 
 
 	/* Per default the PID file name is derived from the
 	 * configuration name. */
 	if (!cl.lockfile[0]) {
 		snprintf(cl.lockfile, sizeof(cl.lockfile)-1,
 				"%s/%s.pid", BOOTH_RUN_DIR, booth_conf->name);
 	}
 
 out:
 	return rv;
 }
 
 static int setup_transport(void)
 {
 	int rv;
 
 	rv = transport()->init(message_recv);
 	if (rv < 0) {
 		log_error("failed to init booth_transport %s", transport()->name);
 		goto out;
 	}
 
 	rv = booth_transport[TCP].init(NULL);
 	if (rv < 0) {
 		log_error("failed to init booth_transport[TCP]");
 		goto out;
 	}
 
 out:
 	return rv;
 }
 
 
 static int write_daemon_state(int fd, int state)
 {
 	char buffer[1024];
 	int rv, size;
 
 	size = sizeof(buffer) - 1;
 	rv = snprintf(buffer, size,
 			"booth_pid=%d "
 			"booth_state=%s "
 			"booth_type=%s "
 			"booth_cfg_name='%s' "
 			"booth_id=%d "
 			"booth_addr_string='%s' "
 			"booth_port=%d\n",
 		getpid(), 
 		( state == BOOTHD_STARTED  ? "started"  : 
 		  state == BOOTHD_STARTING ? "starting" : 
 		  "invalid"), 
 		type_to_string(local->type),
 		booth_conf->name,
 		local->site_id,
 		local->addr_string,
 		booth_conf->port);
 
 	if (rv < 0 || rv == size) {
 		log_error("Buffer filled up in write_daemon_state().");
 		return -1;
 	}
 	size = rv;
 
 
 	rv = ftruncate(fd, 0);
 	if (rv < 0) {
 		log_error("lockfile %s truncate error %d: %s",
 				cl.lockfile, errno, strerror(errno));
 		return rv;
 	}
 
 
 	rv = lseek(fd, 0, SEEK_SET);
 	if (rv < 0) {
 		log_error("lseek set fd(%d) offset to 0 error, return(%d), message(%s)",
 			fd, rv, strerror(errno));
 		rv = -1;
 		return rv;
 	} 
 
 
 	rv = write(fd, buffer, size);
 
 	if (rv != size) {
 		log_error("write to fd(%d, %d) returned %d, errno %d, message(%s)",
                       fd, size,
 		      rv, errno, strerror(errno));
 		return -1;
 	}
 
 	return 0;
 }
 
 static int loop(int fd)
 {
 	void (*workfn) (int ci);
 	void (*deadfn) (int ci);
 	int rv, i;
 
 	rv = setup_transport();
 	if (rv < 0)
 		goto fail;
 
 	rv = setup_ticket();
 	if (rv < 0)
 		goto fail;
 
 	rv = write_daemon_state(fd, BOOTHD_STARTED);
 	if (rv != 0) {
 		log_error("write daemon state %d to lockfile error %s: %s",
                       BOOTHD_STARTED, cl.lockfile, strerror(errno));
 		goto fail;
 	}
 
 	log_info("BOOTH %s daemon started, node id is 0x%08X (%d).",
 		type_to_string(local->type),
 			local->site_id, local->site_id);
 
 	while (1) {
 		rv = poll(pollfds, client_maxi + 1, poll_timeout);
 		if (rv == -1 && errno == EINTR)
 			continue;
 		if (rv < 0) {
 			log_error("poll failed: %s (%d)", strerror(errno), errno);
 			goto fail;
 		}
 
 		for (i = 0; i <= client_maxi; i++) {
 			if (clients[i].fd < 0)
 				continue;
 
 			if (pollfds[i].revents & POLLIN) {
 				workfn = clients[i].workfn;
 				if (workfn)
 					workfn(i);
 			}
 			if (pollfds[i].revents &
 					(POLLERR | POLLHUP | POLLNVAL)) {
 				deadfn = clients[i].deadfn;
 				if (deadfn)
 					deadfn(i);
 			}
 		}
 
 		process_tickets();
 	}
 
 	return 0;
 
 fail:
 	return -1;
 }
 
 
 static int test_reply(cmd_result_t reply_code, cmd_request_t cmd)
 {
 	int rv = 0;
 	const char *op_str = "";
 
 	if (cmd == CMD_GRANT)
 		op_str = "grant";
 	else if (cmd == CMD_REVOKE)
 		op_str = "revoke";
 	else if (cmd == CMD_LIST)
 		op_str = "list";
 	else if (cmd == CMD_PEERS)
 		op_str = "peers";
 	else {
 		log_error("internal error reading reply result!");
 		return -1;
 	}
 
 	switch (reply_code) {
 	case RLT_OVERGRANT:
 		log_info("You're granting a granted ticket. "
 			 "If you wanted to migrate a ticket, "
 			 "use revoke first, then use grant.");
 		rv = -1;
 		break;
 
 	case RLT_TICKET_IDLE:
 		log_info("ticket is not owned");
 		rv = 0;
 		break;
 
 	case RLT_ASYNC:
 		log_info("%s command sent, result will be returned "
 			 "asynchronously. Please use \"booth list\" to "
 			 "see the outcome.", op_str);
 		rv = 0;
 		break;
 
 	case RLT_CIB_PENDING:
 		log_info("%s succeeded (CIB commit pending)", op_str);
 		/* wait for the CIB commit? */
 		rv = (cl.options & OPT_WAIT_COMMIT) ? 3 : 0;
 		break;
 
 	case RLT_MORE:
 		rv = 2;
 		break;
 
 	case RLT_SYNC_SUCC:
 	case RLT_SUCCESS:
 		if (cmd != CMD_LIST && cmd != CMD_PEERS)
 			log_info("%s succeeded!", op_str);
 		rv = 0;
 		break;
 
 	case RLT_SYNC_FAIL:
 		log_info("%s failed!", op_str);
 		rv = -1;
 		break;
 
 	case RLT_INVALID_ARG:
 		log_error("ticket \"%s\" does not exist",
 				cl.msg.ticket.id);
 		rv = -1;
 		break;
 
 	case RLT_AUTH:
 		log_error("authentication error");
 		rv = -1;
 		break;
 
 	case RLT_EXT_FAILED:
 		log_error("before-acquire-handler for ticket \"%s\" failed, grant denied",
 				cl.msg.ticket.id);
 		rv = -1;
 		break;
 
 	case RLT_ATTR_PREREQ:
 		log_error("attr-prereq for ticket \"%s\" failed, grant denied",
 				cl.msg.ticket.id);
 		rv = -1;
 		break;
 
 	case RLT_REDIRECT:
 		/* talk to another site */
 		rv = 1;
 		break;
 
 	default:
 		log_error("got an error code: %x", rv);
 		rv = -1;
 	}
 	return rv;
 }
 
 static int query_get_string_answer(cmd_request_t cmd)
 {
 	struct booth_site *site;
 	struct boothc_hdr_msg reply;
 	struct boothc_header *header;
 	char *data;
 	int data_len;
 	int rv;
 	struct booth_transport const *tpt;
 	int (*test_reply_f) (cmd_result_t reply_code, cmd_request_t cmd);
 	size_t msg_size;
 	void *request;
 
 	if (cl.type == GEOSTORE) {
 		test_reply_f = test_attr_reply;
 		msg_size = sizeof(cl.attr_msg);
 		request = &cl.attr_msg;
 	} else {
 		test_reply_f = test_reply;
 		msg_size = sizeof(cl.msg);
 		request = &cl.msg;
 	}
 	header = (struct boothc_header *)request;
 	data = NULL;
 
 	init_header(header, cmd, 0, cl.options, 0, 0, msg_size);
 
 	if (!*cl.site)
 		site = local;
 	else if (!find_site_by_name(cl.site, &site, 1)) {
 		log_error("cannot find site \"%s\"", cl.site);
 		rv = ENOENT;
 		goto out;
 	}
 
 	tpt = booth_transport + TCP;
 	rv = tpt->open(site);
 	if (rv < 0)
 		goto out_close;
 
 	rv = tpt->send(site, request, msg_size);
 	if (rv < 0)
 		goto out_close;
 
 	rv = tpt->recv_auth(site, &reply, sizeof(reply));
 	if (rv < 0)
 		goto out_close;
 
 	data_len = ntohl(reply.header.length) - rv;
 
 	/* no attribute, or no ticket found */
 	if (!data_len) {
 		goto out_test_reply;
 	}
 
 	data = malloc(data_len+1);
 	if (!data) {
 		rv = -ENOMEM;
 		goto out_close;
 	}
 	rv = tpt->recv(site, data, data_len);
 	if (rv < 0)
 		goto out_close;
 	*(data+data_len) = '\0';
 
 	*(data + data_len) = '\0';
 	(void)fputs(data, stdout);
 	fflush(stdout);
 	rv = 0;
 
 out_test_reply:
 	rv = test_reply_f(ntohl(reply.header.result), cmd);
 out_close:
 	tpt->close(site);
 out:
 	if (data)
 		free(data);
 	return rv;
 }
 
 
 static int do_command(cmd_request_t cmd)
 {
 	struct booth_site *site;
 	struct boothc_ticket_msg reply;
 	struct booth_transport const *tpt;
 	uint32_t leader_id;
 	int rv;
 	int reply_cnt = 0, msg_logged = 0;
 	const char *op_str = "";
 
 	if (cmd == CMD_GRANT)
 		op_str = "grant";
 	else if (cmd == CMD_REVOKE)
 		op_str = "revoke";
 
 	rv = 0;
 	site = NULL;
 
 	/* Always use TCP for client - at least for now. */
 	tpt = booth_transport + TCP;
 
 	if (!*cl.site)
 		site = local;
 	else {
 		if (!find_site_by_name(cl.site, &site, 1)) {
 			log_error("Site \"%s\" not configured.", cl.site);
 			goto out_close;
 		}
 	}
 
 	if (site->type == ARBITRATOR) {
 		if (site == local) {
 			log_error("We're just an arbitrator, cannot grant/revoke tickets here.");
 		} else {
 			log_error("%s is just an arbitrator, cannot grant/revoke tickets there.", cl.site);
 		}
 		goto out_close;
 	}
 
 	assert(site->type == SITE);
 
 	/* We don't check for existence of ticket, so that asking can be
 	 * done without local configuration, too.
 	 * Although, that means that the UDP port has to be specified, too. */
 	if (!cl.msg.ticket.id[0]) {
 		/* If the loaded configuration has only a single ticket defined, use that. */
 		if (booth_conf->ticket_count == 1) {
 			strncpy(cl.msg.ticket.id, booth_conf->ticket[0].name,
 				sizeof(cl.msg.ticket.id));
 		} else {
 			log_error("No ticket given.");
 			goto out_close;
 		}
 	}
 
 redirect:
 	init_header(&cl.msg.header, cmd, 0, cl.options, 0, 0, sizeof(cl.msg));
 
 	rv = tpt->open(site);
 	if (rv < 0)
 		goto out_close;
 
 	rv = tpt->send(site, &cl.msg, sendmsglen(&cl.msg));
 	if (rv < 0)
 		goto out_close;
 
 read_more:
 	rv = tpt->recv_auth(site, &reply, sizeof(reply));
 	if (rv < 0) {
 		/* print any errors depending on the code sent by the
 		 * server */
 		(void)test_reply(ntohl(reply.header.result), cmd);
 		goto out_close;
 	}
 
 	rv = test_reply(ntohl(reply.header.result), cmd);
 	if (rv == 1) {
 		tpt->close(site);
 		leader_id = ntohl(reply.ticket.leader);
 		if (!find_site_by_id(leader_id, &site)) {
 			log_error("Message with unknown redirect site %x received", leader_id);
 			rv = -1;
 			goto out_close;
 		}
 		goto redirect;
 	} else if (rv == 2 || rv == 3) {
 		/* the server has more to say */
 		/* don't wait too long */
 		if (reply_cnt > 1 && !(cl.options & OPT_WAIT)) {
 			rv = 0;
 			log_info("Giving up on waiting for the definite result. "
 				 "Please use \"booth list\" later to "
 				 "see the outcome.");
 			goto out_close;
 		}
 		if (reply_cnt == 0) {
 			log_info("%s request sent, "
 				"waiting for the result ...", op_str);
 			msg_logged++;
 		} else if (rv == 3 && msg_logged < 2) {
 			log_info("waiting for the CIB commit ...");
 			msg_logged++;
 		}
 		reply_cnt++;
 		goto read_more;
 	}
 
 out_close:
 	if (site)
 		tpt->close(site);
 	return rv;
 }
 
 
 
 static int _lockfile(int mode, int *fdp, pid_t *locked_by)
 {
 	struct flock lock;
 	int fd, rv;
 
 
 	/* After reboot the directory may not yet exist.
 	 * Try to create it, but ignore errors. */
 	if (strncmp(cl.lockfile, BOOTH_RUN_DIR,
 				strlen(BOOTH_RUN_DIR)) == 0)
 		mkdir(BOOTH_RUN_DIR, 0775);
 
 
 	if (locked_by)
 		*locked_by = 0;
 
 	*fdp = -1;
 	fd = open(cl.lockfile, mode, 0664);
 	if (fd < 0)
 		return errno;
 
 	*fdp = fd;
 
 	lock.l_type = F_WRLCK;
 	lock.l_start = 0;
 	lock.l_whence = SEEK_SET;
 	lock.l_len = 0;
 	lock.l_pid = 0;
 
 
 	if (fcntl(fd, F_SETLK, &lock) == 0)
 		return 0;
 
 	rv = errno;
 
 	if (locked_by)
 		if (fcntl(fd, F_GETLK, &lock) == 0)
 			*locked_by = lock.l_pid;
 
 	return rv;
 }
 
 
 static inline int is_root(void)
 {
 	return geteuid() == 0;
 }
 
 
 static int create_lockfile(void)
 {
 	int rv, fd;
 
 	fd = -1;
 	rv = _lockfile(O_CREAT | O_WRONLY, &fd, NULL);
 
 	if (fd == -1) {
 		log_error("lockfile %s open error %d: %s",
 				cl.lockfile, rv, strerror(rv));
 		return -1;
 	}
 
 	if (rv < 0) {
 		log_error("lockfile %s setlk error %d: %s",
 				cl.lockfile, rv, strerror(rv));
 		goto fail;
 	}
 
 	rv = write_daemon_state(fd, BOOTHD_STARTING);
 	if (rv != 0) {
 		log_error("write daemon state %d to lockfile error %s: %s",
 				BOOTHD_STARTING, cl.lockfile, strerror(errno));
 		goto fail;
 	}
 
 	if (is_root()) {
 		if (fchown(fd, booth_conf->uid, booth_conf->gid) < 0)
 			log_error("fchown() on lockfile said %d: %s",
 					errno, strerror(errno));
 	}
 
 	return fd;
 
 fail:
 	close(fd);
 	return -1;
 }
 
 static void unlink_lockfile(int fd)
 {
 	unlink(cl.lockfile);
 	close(fd);
 }
 
 static void print_usage(void)
 {
 	printf(
 	"Usage:\n"
 	"  booth list [options]\n"
 	"  booth {grant|revoke} [options] <ticket>\n"
 	"  booth status [options]\n"
 	"\n"
 	"  list:	     List all tickets\n"
 	"  grant:        Grant ticket to site\n"
 	"  revoke:       Revoke ticket\n"
 	"\n"
 	"Options:\n"
 	"  -c FILE       Specify config file [default " BOOTH_DEFAULT_CONF "]\n"
 	"                Can be a path or just a name without \".conf\" suffix\n"
 	"  -s <site>     Connect/grant to a different site\n"
 	"  -F            Try to grant the ticket immediately\n"
 	"                even if not all sites are reachable\n"
 	"                For manual tickets:\n"
 	"                grant a manual ticket even if it has been already granted\n"
 	"  -w            Wait forever for the outcome of the request\n"
 	"  -C            Wait until the ticket is committed to the CIB (grant only)\n"
 	"  -h            Print this help\n"
 	"\n"
 	"Examples:\n"
 	"\n"
 	"  # booth list (list tickets)\n"
 	"  # booth grant ticket-A (grant ticket here)\n"
 	"  # booth grant -s 10.121.8.183 ticket-A (grant ticket to site 10.121.8.183)\n"
 	"  # booth revoke ticket-A (revoke ticket)\n"
 	"\n"
 	"See the booth(8) man page for more details.\n"
 	);
 }
 
 #define OPTION_STRING		"c:Dl:t:s:FhSwC"
 #define ATTR_OPTION_STRING		"c:Dt:s:h"
 
 void safe_copy(char *dest, char *value, size_t buflen, const char *description) {
 	int content_len = buflen - 1;
 
 	if (strlen(value) >= content_len) {
 		fprintf(stderr, "'%s' exceeds maximum %s length of %d\n",
 			value, description, content_len);
 		exit(EXIT_FAILURE);
 	}
 	strncpy(dest, value, content_len);
 	dest[content_len] = 0;
 }
 
 static int host_convert(char *hostname, char *ip_str, size_t ip_size)
 {
 	struct addrinfo *result = NULL, hints = {0};
 	int re = -1;
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = AF_INET;
 	hints.ai_socktype = SOCK_DGRAM;
 
 	re = getaddrinfo(hostname, NULL, &hints, &result);
 
 	if (re == 0) {
 		struct in_addr addr = ((struct sockaddr_in *)result->ai_addr)->sin_addr;
 		const char *re_ntop = inet_ntop(AF_INET, &addr, ip_str, ip_size);
 		if (re_ntop == NULL) {
 			re = -1;
 		}
 	}
 
 	freeaddrinfo(result);
 	return re;
 }
 
 #define cparg(dest, descr) do { \
 	if (optind >= argc) \
 		goto missingarg; \
 	safe_copy(dest, argv[optind], sizeof(dest), descr); \
 	optind++; \
 } while(0)
 
 static int read_arguments(int argc, char **argv)
 {
 	int optchar;
 	char *arg1 = argv[1];
 	char *op = NULL;
 	char *cp;
 	const char *opt_string = OPTION_STRING;
 	char site_arg[INET_ADDRSTRLEN] = {0};
 	int left;
 
 	cl.type = 0;
 	if ((cp = strstr(argv[0], ATTR_PROG)) &&
 			!strcmp(cp, ATTR_PROG)) {
 		cl.type = GEOSTORE;
 		op = argv[1];
 		optind = 2;
 		opt_string = ATTR_OPTION_STRING;
 	} else if (argc > 1 && (strcmp(arg1, "arbitrator") == 0 ||
 			strcmp(arg1, "site") == 0 ||
 			strcmp(arg1, "start") == 0 ||
 			strcmp(arg1, "daemon") == 0)) {
 		cl.type = DAEMON;
 		optind = 2;
 	} else if (argc > 1 && (strcmp(arg1, "status") == 0)) {
 		cl.type = STATUS;
 		optind = 2;
 	} else if (argc > 1 && (strcmp(arg1, "client") == 0)) {
 		cl.type = CLIENT;
 		if (argc < 3) {
 			print_usage();
 			exit(EXIT_FAILURE);
 		}
 		op = argv[2];
 		optind = 3;
 	}
 	if (!cl.type) {
 		cl.type = CLIENT;
 		op = argv[1];
 		optind = 2;
     }
 
 	if (argc < 2 || !strcmp(arg1, "help") || !strcmp(arg1, "--help") ||
 			!strcmp(arg1, "-h")) {
 		if (cl.type == GEOSTORE)
 			print_geostore_usage();
 		else
 			print_usage();
 		exit(EXIT_SUCCESS);
 	}
 
 	if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") ||
 			!strcmp(arg1, "-V")) {
 		printf("%s %s\n", argv[0], RELEASE_STR);
 		exit(EXIT_SUCCESS);
 	}
 
     if (cl.type == CLIENT) {
 		if (!strcmp(op, "list"))
 			cl.op = CMD_LIST;
 		else if (!strcmp(op, "grant"))
 			cl.op = CMD_GRANT;
 		else if (!strcmp(op, "revoke"))
 			cl.op = CMD_REVOKE;
 		else if (!strcmp(op, "peers"))
 			cl.op = CMD_PEERS;
 		else {
 			fprintf(stderr, "client operation \"%s\" is unknown\n",
 					op);
 			exit(EXIT_FAILURE);
 		}
 	} else if (cl.type == GEOSTORE) {
 		if (!strcmp(op, "list"))
 			cl.op = ATTR_LIST;
 		else if (!strcmp(op, "set"))
 			cl.op = ATTR_SET;
 		else if (!strcmp(op, "get"))
 			cl.op = ATTR_GET;
 		else if (!strcmp(op, "delete"))
 			cl.op = ATTR_DEL;
 		else {
 			fprintf(stderr, "attribute operation \"%s\" is unknown\n",
 					op);
 			exit(EXIT_FAILURE);
 		}
 	}
 
 	while (optind < argc) {
 		optchar = getopt(argc, argv, opt_string);
 
 		switch (optchar) {
 		case 'c':
 			if (strchr(optarg, '/')) {
 				safe_copy(cl.configfile, optarg,
 						sizeof(cl.configfile), "config file");
 			} else {
 				/* If no "/" in there, use with default directory. */
 				strcpy(cl.configfile, BOOTH_DEFAULT_CONF_DIR);
 				cp = cl.configfile + strlen(BOOTH_DEFAULT_CONF_DIR);
 				assert(cp > cl.configfile);
 				assert(*(cp-1) == '/');
 
 				/* Write at the \0, ie. after the "/" */
 				safe_copy(cp, optarg,
 						(sizeof(cl.configfile) -
 						 (cp -  cl.configfile) -
 						 strlen(BOOTH_DEFAULT_CONF_EXT)),
 						"config name");
 
 				/* If no extension, append ".conf".
 				 * Space is available, see -strlen() above. */
 				if (!strchr(cp, '.'))
 					strcat(cp, BOOTH_DEFAULT_CONF_EXT);
 			}
 			break;
 
 		case 'D':
 			debug_level++;
 			break;
 
 		case 'S':
 			daemonize = 0;
 			enable_stderr = 1;
 			break;
 
 		case 'l':
 			safe_copy(cl.lockfile, optarg, sizeof(cl.lockfile), "lock file");
 			break;
 		case 't':
 			if (cl.op == CMD_GRANT || cl.op == CMD_REVOKE) {
 				safe_copy(cl.msg.ticket.id, optarg,
 						sizeof(cl.msg.ticket.id), "ticket name");
 			} else if (cl.type == GEOSTORE) {
 				safe_copy(cl.attr_msg.attr.tkt_id, optarg,
 						sizeof(cl.attr_msg.attr.tkt_id), "ticket name");
 			} else {
 				print_usage();
 				exit(EXIT_FAILURE);
 			}
 			break;
 
 		case 's':
 			/* For testing and debugging: allow "-s site" also for
 			 * daemon start, so that the address that should be used
 			 * can be set manually.
 			 * This makes it easier to start multiple processes
 			 * on one machine. */
 			if (cl.type == CLIENT || cl.type == GEOSTORE ||
 					(cl.type == DAEMON && debug_level)) {
 				if (strcmp(optarg, OTHER_SITE) &&
 						host_convert(optarg, site_arg, INET_ADDRSTRLEN) == 0) {
 					safe_copy(cl.site, site_arg, sizeof(cl.site), "site name");
 				} else {
 					safe_copy(cl.site, optarg, sizeof(cl.site), "site name");
 				}
 			} else {
 				log_error("\"-s\" not allowed in daemon mode.");
 				exit(EXIT_FAILURE);
 			}
 			break;
 
 		case 'F':
 			if (cl.type != CLIENT || cl.op != CMD_GRANT) {
 				log_error("use \"-F\" only for client grant");
 				exit(EXIT_FAILURE);
 			}
 			cl.options |= OPT_IMMEDIATE;
 			break;
 
 		case 'w':
 			if (cl.type != CLIENT ||
 					(cl.op != CMD_GRANT && cl.op != CMD_REVOKE)) {
 				log_error("use \"-w\" only for grant and revoke");
 				exit(EXIT_FAILURE);
 			}
 			cl.options |= OPT_WAIT;
 			break;
 
 		case 'C':
 			if (cl.type != CLIENT || cl.op != CMD_GRANT) {
 				log_error("use \"-C\" only for grant");
 				exit(EXIT_FAILURE);
 			}
 			cl.options |= OPT_WAIT | OPT_WAIT_COMMIT;
 			break;
 
 		case 'h':
 			if (cl.type == GEOSTORE)
 				print_geostore_usage();
 			else
 				print_usage();
 			exit(EXIT_SUCCESS);
 			break;
 
 		case ':':
 		case '?':
 			fprintf(stderr, "Please use '-h' for usage.\n");
 			exit(EXIT_FAILURE);
 			break;
 
 		case -1:
 			/* No more parameters on cmdline, only arguments. */
 			goto extra_args;
 
 		default:
 			goto unknown;
 		};
 	}
 
 	return 0;
 
 extra_args:
 	if (cl.type == CLIENT && !cl.msg.ticket.id[0]) {
 		cparg(cl.msg.ticket.id, "ticket name");
 	} else if (cl.type == GEOSTORE) {
 		if (cl.op != ATTR_LIST) {
 			cparg(cl.attr_msg.attr.name, "attribute name");
 		}
 		if (cl.op == ATTR_SET) {
 			cparg(cl.attr_msg.attr.val, "attribute value");
 		}
 	}
 
 	if (optind == argc)
 		return 0;
 
 
 	left = argc - optind;
 	fprintf(stderr, "Superfluous argument%s: %s%s\n",
 			left == 1 ? "" : "s",
 			argv[optind],
 			left == 1 ? "" : "...");
 	exit(EXIT_FAILURE);
 
 unknown:
 	fprintf(stderr, "unknown option: %s\n", argv[optind]);
 	exit(EXIT_FAILURE);
 
 missingarg:
 	fprintf(stderr, "not enough arguments\n");
 	exit(EXIT_FAILURE);
 }
 
 
 static void set_scheduler(void)
 {
 	struct sched_param sched_param;
 	struct rlimit rlimit;
 	int rv;
 
 	rlimit.rlim_cur = RLIM_INFINITY;
 	rlimit.rlim_max = RLIM_INFINITY;
 	setrlimit(RLIMIT_MEMLOCK, &rlimit);
 	rv = mlockall(MCL_CURRENT | MCL_FUTURE);
 	if (rv < 0) {
 		log_error("mlockall failed");
 	}
 
 	rv = sched_get_priority_max(SCHED_RR);
 	if (rv != -1) {
 		sched_param.sched_priority = rv;
 		rv = sched_setscheduler(0, SCHED_RR, &sched_param);
 		if (rv == -1)
 			log_error("could not set SCHED_RR priority %d: %s (%d)",
 					sched_param.sched_priority,
 					strerror(errno), errno);
 	} else {
 		log_error("could not get maximum scheduler priority err %d",
 				errno);
 	}
 }
 
 static int set_procfs_val(const char *path, const char *val)
 {
 	int rc = -1;
 	FILE *fp = fopen(path, "w");
 
 	if (fp) {
 		if (fprintf(fp, "%s", val) > 0)
 			rc = 0;
 		fclose(fp);
 	}
 	return rc;
 }
 
 static int do_status(int type)
 {
 	pid_t pid;
 	int rv, status_lock_fd, ret;
 	const char *reason = NULL;
 	char lockfile_data[1024], *cp;
 
 
 	ret = PCMK_OCF_NOT_RUNNING;
 
 	rv = setup_config(type);
 	if (rv) {
 		reason = "Error reading configuration.";
 		ret = PCMK_OCF_UNKNOWN_ERROR;
 		goto quit;
 	}
 
 
 	if (!local) {
 		reason = "No Service IP active here.";
 		goto quit;
 	}
 
 
 	rv = _lockfile(O_RDWR, &status_lock_fd, &pid);
 	if (status_lock_fd == -1) {
 		reason = "No PID file.";
 		goto quit;
 	}
 	if (rv == 0) {
 		close(status_lock_fd);
 		reason = "PID file not locked.";
 		goto quit;
 	}
 	if (pid) {
 		fprintf(stdout, "booth_lockpid=%d ", pid);
 		fflush(stdout);
 	}
 
 	rv = read(status_lock_fd, lockfile_data, sizeof(lockfile_data) - 1);
 	if (rv < 4) {
 		close(status_lock_fd);
 		reason = "Cannot read lockfile data.";
 		ret = PCMK_LSB_UNKNOWN_ERROR;
 		goto quit;
 	}
 	lockfile_data[rv] = 0;
 
 	close(status_lock_fd);
 
 
 	/* Make sure it's only a single line */
 	cp = strchr(lockfile_data, '\r');
 	if (cp)
 		*cp = 0;
 	cp = strchr(lockfile_data, '\n');
 	if (cp)
 		*cp = 0;
 
 
 
 	rv = setup_tcp_listener(1);
 	if (rv == 0) {
 		reason = "TCP port not in use.";
 		goto quit;
 	}
 
 
 	fprintf(stdout, "booth_lockfile='%s' %s\n",
 			cl.lockfile, lockfile_data);
 	if (!daemonize)
 		fprintf(stderr, "Booth at %s port %d seems to be running.\n",
 				local->addr_string, booth_conf->port);
 	return 0;
 
 
 quit:
 	log_debug("not running: %s", reason);
 	/* Ie. "DEBUG" */
 	if (!daemonize)
 		fprintf(stderr, "not running: %s\n", reason);
 	return ret;
 }
 
 
 static int limit_this_process(void)
 {
 	int rv;
 	if (!is_root())
 		return 0;
 
 	if (setregid(booth_conf->gid, booth_conf->gid) < 0) {
 		rv = errno;
 		log_error("setregid() didn't work: %s", strerror(rv));
 		return rv;
 	}
 
 	if (setreuid(booth_conf->uid, booth_conf->uid) < 0) {
 		rv = errno;
 		log_error("setreuid() didn't work: %s", strerror(rv));
 		return rv;
 	}
 
 	return 0;
 }
 
 static int lock_fd = -1;
 
 static void server_exit(void)
 {
 	int rv;
 
 	if (lock_fd >= 0) {
 		/* We might not be able to delete it, but at least
 		 * make it empty. */
 		rv = ftruncate(lock_fd, 0);
 		(void)rv;
 		unlink_lockfile(lock_fd);
 	}
 	log_info("exiting");
 }
 
 static void sig_exit_handler(int sig)
 {
 	log_info("caught signal %d", sig);
 	exit(0);
 }
 
 static int do_server(int type)
 {
 	int rv = -1;
 	static char log_ent[128] = DAEMON_NAME "-";
 
 	rv = setup_config(type);
 	if (rv < 0)
 		return rv;
 
 	if (!local) {
 		log_error("Cannot find myself in the configuration.");
 		exit(EXIT_FAILURE);
 	}
 
 	if (daemonize) {
 		if (daemon(0, 0) < 0) {
 			perror("daemon error");
 			exit(EXIT_FAILURE);
 		}
 	}
 
 	/*
 	 * Register signal and exit handler
 	 */
 	signal(SIGUSR1, (__sighandler_t)tickets_log_info);
 	signal(SIGTERM, (__sighandler_t)sig_exit_handler);
 	signal(SIGINT, (__sighandler_t)sig_exit_handler);
 	/* we'll handle errors there and then */
 	signal(SIGPIPE, SIG_IGN);
 
 	atexit(server_exit);
 
 	/* The lockfile must be written to _after_ the call to daemon(), so
 	 * that the lockfile contains the pid of the daemon, not the parent. */
 	lock_fd = create_lockfile();
 	if (lock_fd < 0)
 		return lock_fd;
 
 	strcat(log_ent, type_to_string(local->type));
 	cl_log_set_entity(log_ent);
 	cl_log_enable_stderr(enable_stderr ? TRUE : FALSE);
 	cl_log_set_facility(HA_LOG_FACILITY);
 	cl_inherit_logging_environment(0);
 
 	log_info("BOOTH %s %s daemon is starting",
 			type_to_string(local->type), RELEASE_STR);
 
 
 	set_scheduler();
 	/* we don't want to be killed by the OOM-killer */
 	if (set_procfs_val("/proc/self/oom_score_adj", "-999"))
 		(void)set_procfs_val("/proc/self/oom_adj", "-16");
 	set_proc_title("%s %s %s for [%s]:%d",
 			DAEMON_NAME,
 			cl.configfile,
 			type_to_string(local->type),
 			local->addr_string,
 			booth_conf->port);
 
 	rv = limit_this_process();
 	if (rv)
 		return rv;
 
 #ifdef COREDUMP_NURSING
 	if (cl_enable_coredumps(TRUE) < 0){
 		log_error("enabling core dump failed");
 	}
 	cl_cdtocoredir();
 	prctl(PR_SET_DUMPABLE, (unsigned long)TRUE, 0UL, 0UL, 0UL);
 #else
 	if (chdir(BOOTH_CORE_DIR) < 0) {
 		log_error("cannot change working directory to %s", BOOTH_CORE_DIR);
 	}
 #endif
 
 	signal(SIGCHLD, (__sighandler_t)wait_child);
 	rv = loop(lock_fd);
 
 	return rv;
 }
 
 static int do_client(void)
 {
 	int rv;
 
 	rv = setup_config(CLIENT);
 	if (rv < 0) {
 		log_error("cannot read config");
 		goto out;
 	}
 
 	switch (cl.op) {
 	case CMD_LIST:
 	case CMD_PEERS:
 		rv = query_get_string_answer(cl.op);
 		break;
 
 	case CMD_GRANT:
 	case CMD_REVOKE:
 		rv = do_command(cl.op);
 		break;
 	}
 
 out:
 	return rv;
 }
 
 static int do_attr(void)
 {
 	int rv = -1;
 
 	rv = setup_config(GEOSTORE);
 	if (rv < 0) {
 		log_error("cannot read config");
 		goto out;
 	}
 
 	/* We don't check for existence of ticket, so that asking can be
 	 * done without local configuration, too.
 	 * Although, that means that the UDP port has to be specified, too. */
 	if (!cl.attr_msg.attr.tkt_id[0]) {
 		/* If the loaded configuration has only a single ticket defined, use that. */
 		if (booth_conf->ticket_count == 1) {
 			strncpy(cl.attr_msg.attr.tkt_id, booth_conf->ticket[0].name,
 				sizeof(cl.attr_msg.attr.tkt_id));
 		} else {
 			rv = 1;
 			log_error("No ticket given.");
 			goto out;
 		}
 	}
 
 	switch (cl.op) {
 	case ATTR_LIST:
 	case ATTR_GET:
 		rv = query_get_string_answer(cl.op);
 		break;
 
 	case ATTR_SET:
 	case ATTR_DEL:
 		rv = do_attr_command(cl.op);
 		break;
 	}
 
 out:
 	return rv;
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
 	int rv;
 	const char *cp;
 #ifdef LOGGING_LIBQB
 	enum qb_log_target_slot i;
 #endif
 
 	init_set_proc_title(argc, argv, envp);
 	get_time(&start_time);
 
 	memset(&cl, 0, sizeof(cl));
 	strncpy(cl.configfile,
 			BOOTH_DEFAULT_CONF, BOOTH_PATH_LEN - 1);
 	cl.lockfile[0] = 0;
 	debug_level = 0;
 
 
 	cp = ((cp = strstr(argv[0], ATTR_PROG)) && !strcmp(cp, ATTR_PROG)
 		? ATTR_PROG
 		: "booth");
 #ifndef LOGGING_LIBQB
 	cl_log_set_entity(cp);
 #else
 	qb_log_init(cp, LOG_USER, LOG_DEBUG);  /* prio driven by debug_level */
 	for (i = QB_LOG_TARGET_START; i < QB_LOG_TARGET_MAX; i++) {
 		if (i == QB_LOG_SYSLOG || i == QB_LOG_BLACKBOX)
 			continue;
 		qb_log_format_set(i, "%t %H %N: [%P]: %p: %b");
 	}
 	(void) qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
 	                         QB_LOG_FILTER_FILE, "*", LOG_DEBUG);
 #endif
 	cl_log_enable_stderr(TRUE);
 	cl_log_set_facility(0);
 
 	rv = read_arguments(argc, argv);
 	if (rv < 0)
 		goto out;
 
 
 	switch (cl.type) {
 	case STATUS:
 		rv = do_status(cl.type);
 		break;
 
 	case ARBITRATOR:
 	case DAEMON:
 	case SITE:
 		rv = do_server(cl.type);
 		break;
 
 	case CLIENT:
 		rv = do_client();
 		break;
 
 	case GEOSTORE:
 		rv = do_attr();
 		break;
 	}
 
 out:
 #ifdef LOGGING_LIBQB
 	qb_log_fini();
 #endif
 	/* Normalize values. 0x100 would be seen as "OK" by waitpid(). */
 	return (rv >= 0 && rv < 0x70) ? rv : 1;
 }