diff --git a/Makefile.am b/Makefile.am
index 1148203..1115043 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,262 +1,259 @@
 # 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/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 \
 			  contrib \
 			  icons \
 			  $(SPEC).in booth-rpmlintrc \
 			  .version build-aux/git-version-gen build-aux/PKG_CHECK_VAR.m4 \
 			  build-aux/gitlog-to-changelog build-aux/release.mk
 
 AUTOMAKE_OPTIONS	= foreign
 
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf test_lense.sh \
 			  compile
 
 # Don't try to install files outside build directory for "make distcheck".
 AM_DISTCHECK_CONFIGURE_FLAGS = --with-ocfdir="$$dc_install_base/lib/ocf"
 
 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
 
 pkgconfigdir		= $(datadir)/pkgconfig
 pkgconfig_DATA		= booth.pc
 
 TESTS			= test/runtests.py
 
 SUBDIRS			= src docs conf
 
 MOCK_DIR 		= $(abs_builddir)/mock
 MOCK_OPTIONS 		?= --resultdir="$(MOCK_DIR)" --no-cleanup-after
 
 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* $(SPEC)
 	-rm -rf booth-*.rpm $(TARFILE)
 
 dist-clean-local:
 	rm -f autoconf automake autoheader
 
 # release/versioning
 BUILT_SOURCES = .version
 .version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 
 dist-hook: gen-ChangeLog
 	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.
 $(abs_builddir)/booth-rpmlintrc:
 	cat $(abs_srcdir)/booth-rpmlintrc > booth-rpmlintrc
 
 $(SPEC): $(SPEC).in .version config.status $(abs_builddir)/booth-rpmlintrc
 	rm -f $@-t $@
 	date="$(shell LC_ALL=C date "+%a %b %d %Y")" && \
 	gvgver="`cd $(abs_srcdir); build-aux/git-version-gen --fallback $(VERSION) .tarball-version .gitarchivever`" && \
 	if [ "$$gvgver" = "`echo $$gvgver | sed 's/-/./'`" ];then \
 		rpmver="$$gvgver" && \
 		alphatag="" && \
 		dirty="" && \
 		numcomm="0"; \
 	else \
 		gitver="`echo $$gvgver | sed 's/\(.*\)\./\1-/'`" && \
 		rpmver=`echo $$gitver | sed 's/-.*//g'` && \
 		alphatag=`echo $$gvgver | sed 's/[^-]*-\([^-]*\).*/\1/'` && \
 		numcomm=`echo $$gitver | sed 's/[^-]*-\([^-]*\).*/\1/'` && \
 		dirty="" && \
 		if [ "`echo $$gitver | sed 's/^.*-dirty$$//g'`" = "" ];then \
 			dirty="dirty"; \
 		fi \
 	fi && \
 	if [ "$$numcomm" = "0" ]; then numcomm=""; fi && \
 	if [ -n "$$numcomm" ]; then numcomm="%global numcomm $$numcomm"; fi && \
 	if [ "$$alphatag" = "$$gitver" ]; then alphatag=""; fi && \
 	if [ -n "$$alphatag" ]; then alphatag="%global alphatag $$alphatag"; fi && \
 	if [ -n "$$dirty" ]; then dirty="%global dirty dirty"; fi && \
 	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" \
 	$(abs_srcdir)/$@.in > $@-t;
 	sed -i -e "s#@uname@#$(CRM_DAEMON_USER)#g" $@-t
 	sed -i -e "s#@gname@#$(CRM_DAEMON_GROUP)#g" $@-t
 if BUILD_ASCIIDOC_HTML_MAN
 	sed -i -e "s#@bcond_html_man@#bcond_without#g" $@-t
 else
 	sed -i -e "s#@bcond_html_man@#bcond_with#g" $@-t
 endif
 if IS_ASCIIDOC
 	sed -i -e "s#@asciidoc@#asciidoc#g" $@-t
 else
 	sed -i -e "s#@asciidoc@#asciidoctor#g" $@-t
 endif
 if LOGGING_LIBQB
 	sed -i -e "s#@bcond_glue@#bcond_with#g" $@-t
 else
 	sed -i -e "s#@bcond_glue@#bcond_without#g" $@-t
 endif
 if PYTHON_IS_VERSION3
 	sed -i -e "s#@bcond_python3@#bcond_without#g" $@-t
 else
 	sed -i -e "s#@bcond_python3@#bcond_with#g" $@-t
 endif
 if RUN_BUILD_TESTS
 	sed -i -e "s#@bcond_run_build_tests@#bcond_without#g" $@-t
 else
 	sed -i -e "s#@bcond_run_build_tests@#bcond_with#g" $@-t
 endif
 	chmod a-w $@-t
 	mv $@-t $@
 	rm -f $@-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
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
 
 rpm: clean
 	$(MAKE) $(SPEC) $(TARFILE)
 	rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
 
 mock-%: clean srpm
 	mock $(MOCK_OPTIONS) --root=$* --no-cleanup-after --rebuild     \
 		"$(abs_top_builddir)"/*.src.rpm
 
 .PHONY: mock-clean
 mock-clean:
 	-rm -rf "$(MOCK_DIR)"
 
 gen_start_date = 2000-01-01
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
 	if test -d $(abs_srcdir)/.git; then				\
 		LC_ALL=C $(top_srcdir)/build-aux/gitlog-to-changelog	\
 			--since=$(gen_start_date) > $(distdir)/cl-t;	\
 		rm -f $(distdir)/ChangeLog;				\
 		mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
 	fi
diff --git a/configure.ac b/configure.ac
index 6b86bbe..97abbbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,535 +1,517 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 # bootstrap / init
 AC_PREREQ([2.69])
 
 AC_INIT([booth],
     [m4_esyscmd([build-aux/git-version-gen --fallback 1.2 .tarball-version .gitarchivever])],
     [users@clusterlabs.org])
 
 AC_USE_SYSTEM_EXTENSIONS
 
 AM_INIT_AUTOMAKE([-Wno-portability subdir-objects])
 
 AC_CONFIG_MACRO_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([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
 
 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
 
 # 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
 PKG_PROG_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"")
 
 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])
 AM_CONDITIONAL(PYTHON_IS_VERSION3, test "x${PYTHON_VERSION%%.*}" = "x3")
 
 # Checks for header files.
 AC_FUNC_ALLOCA
 AC_HEADER_DIRENT
 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_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_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_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fcntl \
 		getcwd getpeerucred getpeereid gettimeofday memmove \
 		memset mkdir scandir select socket strcasecmp strchr strdup \
 		strerror strrchr strspn strstr \
 		sched_get_priority_max sched_setscheduler])
 
 AC_CONFIG_FILES([Makefile
 		 booth.pc
 		 src/Makefile
 		 docs/Makefile
 		 conf/Makefile])
 AC_CONFIG_FILES([conf/booth-arbitrator.service conf/booth@.service])
 AC_CONFIG_FILES([script/service-runnable], [chmod +x script/service-runnable])
 
 # ===============================================
 # Helpers
 # ===============================================
 
 ## PKG_CHECK_VAR wrapper that allows defining a default value
 ## when value from pkg-config is not detected
 
 AC_DEFUN([BOOTH_PKG_CHECK_VAR], [
 	  varname=$1
 	  default=$4
 	  AC_MSG_CHECKING([for pkg-conf $2 var $3])
 	  PKG_CHECK_VAR([$1], [$2], [$3])
 	  AS_VAR_IF([$1], [""],
 		    [AS_VAR_IF([default], [""],
 			       AC_MSG_ERROR([not found]),
 			       [AS_VAR_COPY([$varname], [default]) && AC_MSG_RESULT([not found, using default ${!varname}])])],
 		    [AC_MSG_RESULT([yes (detected: ${!varname})])])
 ])
 
 ## 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
 }
 
 ## 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" ])
 
 AC_ARG_WITH([html_man],
 	[  --with-html_man                 : Enable generating man pages in HTML.])
 
 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])
 
 AC_ARG_WITH([run_build_tests],
 	[  --with-run-build-tests          : Enable running build tests when generating RPM],
 	[run_build_tests=yes],
 	[])
 AM_CONDITIONAL([RUN_BUILD_TESTS], [test "x$run_build_tests" = "xyes"])
 
 # figure out ocfdir automatically and allow manual override (mostly for CI)
 
 BOOTH_PKG_CHECK_VAR([OCFROOT], [resource-agents], [ocfrootdir], [/usr/lib/ocf])
 
 AC_ARG_WITH([ocfdir],
 	[  --with-ocfdir=DIR               : path to ocfdir (default: autodetected). ],
 	[ ocfdir="$withval" ],
 	[ ocfdir="$OCFROOT" ])
 
 AC_SUBST([ocfdir])
 
 AC_ARG_WITH([hmac_library],
 	[  --with-hmac-library=LIBRARY     : Select HMAC library to use (default: autodetect one of gnutls, gcrypt or mhash).])
 
 # GnuTLS, libgcrypt or mhash for hmac
 hmac_library_installed="no"
 if test "x$with_hmac_library" == "x" && test "x$hmac_library_installed" == "xno" || \
     test "x$with_hmac_library" == "xgnutls"; then
 	libgnutls_installed="yes"
 	PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.10.0], [
 	    AC_DEFINE([HAVE_LIBGNUTLS], [1], [Have gnutls library])
 	    libgnutls_installed="yes"
 	    ], [libgnutls_installed="no"])
 	hmac_library_installed="${libgnutls_installed}"
 fi
 
 if test "x$with_hmac_library" == "x" && test "x$hmac_library_installed" == "xno" || \
     test "x$with_hmac_library" == "xgcrypt"; then
 	libgcrypt_installed="yes"
 	AC_CHECK_HEADERS(gcrypt.h, , [libgcrypt_installed="no"],)
 	AC_CHECK_LIB(gcrypt, gcry_md_open, , [libgcrypt_installed="no"])
 	hmac_library_installed="${libgcrypt_installed}"
 fi
 
 if test "x$with_hmac_library" == "x" && test "x$hmac_library_installed" == "xno" || \
     test "x$with_hmac_library" == "xmhash"; then
 	mhash_installed="yes"
 	AC_CHECK_HEADERS(mhash.h, , [mhash_installed="no"],)
 	AC_CHECK_LIB(mhash, mhash_init, , [mhash_installed="no"])
 	hmac_library_installed="${mhash_installed}"
 fi
 
 if test "x$with_hmac_library" != "x" && test "x$hmac_library_installed" == "xno";then
 	AC_MSG_ERROR([required HMAC library not detected])
 fi
 
 AM_CONDITIONAL(BUILD_AUTH_C, test "x${hmac_library_installed}" = "xyes")
 
 # 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
 	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]])])
 	logging_provider=libqb
 fi
 case "$logging_provider" in
 libplumb)
 	LOGGER="ha_logger"
 	;;
 libqb)
 	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
 BOOTH_PKG_CHECK_VAR([CRM_DAEMON_USER], [pacemaker], [daemon_user], [hacluster])
 AC_DEFINE_UNQUOTED(CRM_DAEMON_USER,"$CRM_DAEMON_USER", User to run Booth daemon as)
 
 BOOTH_PKG_CHECK_VAR([CRM_DAEMON_GROUP], [pacemaker], [daemon_group], [haclient])
 AC_DEFINE_UNQUOTED(CRM_DAEMON_GROUP,"$CRM_DAEMON_GROUP", Group to run Booth daemon as)
 
 # *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_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #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])])
 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 $LIBGNUTLS_CFLAGS"
-CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS $GLIB_CFLAGS $RESMON_CFLAGS $XML_CFLAGS"
+CPPFLAGS="$ENV_CPPFLAGS $OS_CPPFLAGS $GLIB_CFLAGS $RESMON_CFLAGS $XML_CFLAGS"
 LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
 LIBS="$LIBS $XML_LIBS $LIBGNUTLS_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_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_OUTPUT
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE configuration:])
 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([  ocf dir                  = ${ocfdir}])
 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/Makefile.am b/src/Makefile.am
index 4023791..b3c35bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,58 +1,55 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		= -fPIC -Werror -funsigned-char -Wno-pointer-sign
 
 
 AM_CPPFLAGS		= -I$(top_builddir)/include
 
 sbin_PROGRAMS		= boothd
 
 boothd_SOURCES	 	= config.c main.c raft.c ticket.c transport.c \
 			  pacemaker.c handler.c request.c attr.c manual.c
 
 noinst_HEADERS		= \
 			  attr.h booth.h handler.h log.h pacemaker.h request.h timer.h \
 			  auth.h config.h inline-fn.h manual.h raft.h ticket.h transport.h
 
 if BUILD_TIMER_C
 boothd_SOURCES		+= timer.c
 endif
 
 if BUILD_AUTH_C
 boothd_SOURCES		+= auth.c
 endif
 
 boothd_LDFLAGS		= $(OS_DYFLAGS) -L./
 boothd_LDADD		= -lm $(GLIB_LIBS) $(ZLIB_LIBS)
 boothd_CFLAGS		= $(GLIB_CFLAGS) $(PCMK_CFLAGS)
 
 if !LOGGING_LIBQB
 boothd_LDADD		+= -lplumb
 else
 boothd_LDADD		+= $(LIBQB_LIBS)
 boothd_SOURCES		+= alt/logging_libqb.c
 noinst_HEADERS		+= alt/logging_libqb.h
 endif
 
 if !RANGE2RANDOM_GLIB
 boothd_LDADD		+= -lplumb
 else
 boothd_LDADD		+= $(GLIB_LIBS)
 boothd_SOURCES		+= alt/range2random_glib.c
 noinst_HEADERS		+= alt/range2random_glib.h
 endif
 
 if !NAMETAG_LIBSYSTEMD
 boothd_LDADD		+= -lplumbgpl
 else
 boothd_LDADD		+= $(LIBSYSTEMD_LIBS)
 boothd_SOURCES		+= alt/nametag_libsystemd.c
 noinst_HEADERS		+= alt/nametag_libsystemd.h
 endif
 
 if COREDUMP_NURSING
 boothd_LDADD		+= -lplumb
 endif
-
-lint:
-	-splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) *.c