diff --git a/configure.ac b/configure.ac
index 039b4942c..10f5314da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,1040 +1,1041 @@
 dnl
 dnl autoconf for Agents
 dnl
 dnl License: GNU General Public License (GPL)
 
 dnl ===============================================
 dnl Bootstrap 
 dnl ===============================================
 AC_PREREQ(2.63)
 
 dnl Suggested structure:
 dnl     information on the package
 dnl     checks for programs
 dnl     checks for libraries
 dnl     checks for header files
 dnl     checks for types
 dnl     checks for structures
 dnl     checks for compiler characteristics
 dnl     checks for library functions
 dnl     checks for system services
 
 AC_INIT([resource-agents], 
 	m4_esyscmd([make/git-version-gen .tarball-version]),
 	[to_be_defined@foobar.org])
 
 AC_USE_SYSTEM_EXTENSIONS
 
 CRM_DTD_VERSION="1.0"
 
 PKG_FEATURES=""
 
 AC_CONFIG_AUX_DIR(.)
 AC_CANONICAL_HOST
 
 dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
 dnl
 dnl Internal header: include/config.h
 dnl   - Contains ALL defines
 dnl   - include/config.h.in is generated automatically by autoheader
 dnl   - NOT to be included in any header files except lha_internal.h
 dnl     (which is also not to be included in any other header files)
 dnl
 dnl External header: include/agent_config.h
 dnl   - Contains a subset of defines checked here
 dnl   - Manually edit include/agent_config.h.in to have configure include new defines
 dnl   - Should not include HAVE_* defines
 dnl   - Safe to include anywhere
 AM_CONFIG_HEADER(include/config.h include/agent_config.h)
 ALL_LINGUAS="en fr"
 
 AC_ARG_WITH(version,
     [  --with-version=version   Override package version (if you're a packager needing to pretend) ],
     [ PACKAGE_VERSION="$withval" ])
 
 AC_ARG_WITH(pkg-name,
     [  --with-pkg-name=name     Override package name (if you're a packager needing to pretend) ],
     [ PACKAGE_NAME="$withval" ])
 
 AC_PATH_PROGS(PKGCONFIG, pkg-config)
 if test x"${PKGCONFIG}" = x""; then
    AC_MSG_ERROR(You need pkgconfig installed in order to build ${PACKAGE})
 fi
 
 AC_ARG_WITH([systemdsystemunitdir],
      [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
      [with_systemdsystemunitdir=auto])
 AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
      def_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)
 
      AS_IF([test "x$def_systemdsystemunitdir" = "x"],
          [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
                 [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
           with_systemdsystemunitdir=no],
          [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
 AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
       [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
 AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
 
 AC_ARG_WITH([systemdtmpfilesdir],
      AS_HELP_STRING([--with-systemdtmpfilesdir=DIR], [Directory for systemd tmp files]),
      [], [with_systemdtmpfilesdir=$($PKGCONFIG --variable=tmpfilesdir systemd)])
      if test "x$with_systemdtmpfilesdir" != xno; then
          AC_SUBST([systemdtmpfilesdir], [$with_systemdtmpfilesdir])
      fi
 AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdtmpfilesdir" -a "x$with_systemdtmpfilesdir" != xno ])
 
 dnl 
 dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
 dnl
 
 AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
 
 AC_DEFINE_UNQUOTED(AGENTS_VERSION, "$PACKAGE_VERSION", Current agents version)
 
 CC_IN_CONFIGURE=yes
 export CC_IN_CONFIGURE
 
 LDD=ldd
 
 dnl ========================================================================
 dnl Compiler characteristics
 dnl ========================================================================
 
 # 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 dnl Can force other with environment variable "CC".
 AM_PROG_CC_C_O
 AC_PROG_CC_STDC
 AC_PROG_AWK
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
 AC_C_STRINGIZE
 AC_C_INLINE
 
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UID_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT8_T
 AC_TYPE_UINT32_T
 
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 AC_STRUCT_TIMEZONE
 
 dnl ===============================================
 dnl Helpers 
 dnl ===============================================
 cc_supports_flag() {
 	local CPPFLAGS="$@"
 	AC_MSG_CHECKING(whether $CC supports "$@")
 	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])],
 			  [RC=0; AC_MSG_RESULT([yes])],
 			  [RC=1; AC_MSG_RESULT([no])])
 	return $RC
 }
 
 extract_header_define() {
 	  AC_MSG_CHECKING(for $2 in $1)
 	  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) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
 	  $CC $CFLAGS ${Cfile}.c -o ${Cfile}
 	  value=`${Cfile}`
 	  AC_MSG_RESULT($value)
 	  printf $value
 	  rm -f ${Cfile}.c ${Cfile}
 	}
 
 AC_MSG_NOTICE(Sanitizing prefix: ${prefix})
 case $prefix in
   NONE)
 	prefix=/usr
 	dnl Fix default variables - "prefix" variable if not specified
 	if test "$localstatedir" = "\${prefix}/var"; then
 		localstatedir="/var"
 	fi
 	if test "$sysconfdir" = "\${prefix}/etc"; then
 		sysconfdir="/etc"
 	fi
 	;;
 esac
 
 dnl ===============================================
 dnl Configure Options
 dnl ===============================================
 
 dnl Some systems, like Solaris require a custom package name
 AC_ARG_WITH(pkgname,
     [  --with-pkgname=name     name for pkg (typically for Solaris) ],
     [ PKGNAME="$withval" ],
     [ PKGNAME="LXHAhb" ],
   )
 AC_SUBST(PKGNAME)
 
 AC_ARG_ENABLE([ansi],
 [  --enable-ansi force GCC to compile to ANSI/ANSI standard for older compilers.
      [default=yes]])
 
 AC_ARG_ENABLE([fatal-warnings],
 [  --enable-fatal-warnings very pedantic and fatal warnings for gcc
      [default=yes]])
 
 INITDIR=""
 AC_ARG_WITH(initdir,
     [  --with-initdir=DIR      directory for init (rc) scripts [${INITDIR}]],
     [ INITDIR="$withval" ])
 
 OCF_ROOT_DIR="${prefix}/lib/ocf"
 AC_ARG_WITH(ocf-root,
     [  --with-ocf-root=DIR      directory for OCF scripts [${OCF_ROOT_DIR}]],
     [ OCF_ROOT_DIR="$withval" ])
 HA_RSCTMPDIR=${localstatedir}/run/resource-agents
 AC_ARG_WITH(rsctmpdir,
     [  --with-rsctmpdir=DIR      directory for resource agents state files [${HA_RSCTMPDIR}]],
     [ HA_RSCTMPDIR="$withval" ])
 
 AC_ARG_ENABLE([libnet],
  [  --enable-libnet 	Use libnet for ARP based funcationality, [default=try]], 
  [enable_libnet="$enableval"], [enable_libnet=try])
 
 BUILD_RGMANAGER=0
 BUILD_LINUX_HA=0
 
 RASSET=all
 AC_ARG_WITH(ras-set,
     [  --with-ras-set=SET     build/install only linux-ha or rgmanager resource-agents [default: all]],
     [ RASSET="$withval" ])
 
 if test x$RASSET = xyes || test x$RASSET = xall ; then
 	BUILD_RGMANAGER=1
 	BUILD_LINUX_HA=1
 fi
 
 if test x$RASSET = xlinux-ha; then
 	BUILD_LINUX_HA=1
 fi
 
 if test x$RASSET = xrgmanager; then
 	BUILD_RGMANAGER=1
 fi
 
 if test $BUILD_LINUX_HA -eq 0 && test $BUILD_RGMANAGER -eq 0; then
 	AC_MSG_ERROR([Are you really sure you want this package?])
 	exit 1
 fi
 
 AM_CONDITIONAL(BUILD_LINUX_HA, test $BUILD_LINUX_HA -eq 1)
 AM_CONDITIONAL(BUILD_RGMANAGER, test $BUILD_RGMANAGER -eq 1)
 
 AC_ARG_WITH(compat-habindir,
     [  --with-compat-habindir      use HA_BIN directory with compatibility for the Heartbeat stack [${libexecdir}]],
     [],
     [with_compat_habindir=no])
 AM_CONDITIONAL(WITH_COMPAT_HABINDIR, test "x$with_compat_habindir" != "xno")
 
 
 dnl ===============================================
 dnl General Processing
 dnl ===============================================
 
 echo Our Host OS: $host_os/$host
 
 AC_MSG_NOTICE(Sanitizing exec_prefix: ${exec_prefix})
 case $exec_prefix in
   dnl For consistency with Heartbeat, map NONE->$prefix
   NONE)	  exec_prefix=$prefix;;
   prefix) exec_prefix=$prefix;;
 esac
 
 AC_MSG_NOTICE(Sanitizing INITDIR: ${INITDIR})
 case $INITDIR in
   prefix) INITDIR=$prefix;;
   "")
     AC_MSG_CHECKING(which init (rc) directory to use)
       for initdir in /etc/init.d /etc/rc.d/init.d /sbin/init.d	\
 	   /usr/local/etc/rc.d /etc/rc.d
       do
         if
           test -d $initdir
         then
           INITDIR=$initdir
           break
         fi
       done
       if 
       	 test -z $INITDIR
       then
           INITDIR=${sysconfdir}/init.d
       fi
       AC_MSG_RESULT($INITDIR);;
 esac
 AC_SUBST(INITDIR)
 
 if test "${prefix}" = "/usr"; then
  INITDIRPREFIX="$INITDIR" 
 else
  INITDIRPREFIX="${prefix}/$INITDIR"
 fi
 
 AC_SUBST(INITDIRPREFIX)
 
 AC_MSG_NOTICE(Sanitizing libdir: ${libdir})
 case $libdir in
   dnl For consistency with Heartbeat, map NONE->$prefix
   *prefix*|NONE)
     AC_MSG_CHECKING(which lib directory to use)
     for aDir in lib64 lib
     do
       trydir="${exec_prefix}/${aDir}"
       if
         test -d ${trydir}
       then
         libdir=${trydir}
         break
       fi
     done
     AC_MSG_RESULT($libdir);
     ;;
 esac
 
 if test "x$with_compat_habindir" != "xno" ; then
   libexecdir=${libdir}
 fi
 
 dnl Expand autoconf variables so that we dont end up with '${prefix}' 
 dnl in #defines and python scripts
 dnl NOTE: Autoconf deliberately leaves them unexpanded to allow
 dnl    make exec_prefix=/foo install
 dnl No longer being able to do this seems like no great loss to me...
 
 eval prefix="`eval echo ${prefix}`"
 eval exec_prefix="`eval echo ${exec_prefix}`"
 eval bindir="`eval echo ${bindir}`"
 eval sbindir="`eval echo ${sbindir}`"
 eval libexecdir="`eval echo ${libexecdir}`"
 eval datadir="`eval echo ${datadir}`"
 eval sysconfdir="`eval echo ${sysconfdir}`"
 eval sharedstatedir="`eval echo ${sharedstatedir}`"
 eval localstatedir="`eval echo ${localstatedir}`"
 eval libdir="`eval echo ${libdir}`"
 eval includedir="`eval echo ${includedir}`"
 eval oldincludedir="`eval echo ${oldincludedir}`"
 eval infodir="`eval echo ${infodir}`"
 eval mandir="`eval echo ${mandir}`"
 
 dnl docdir is a recent addition to autotools
 eval docdir="`eval echo ${docdir}`"
 if test "x$docdir" = "x"; then
    docdir="`eval echo ${datadir}/doc`"
 fi
 AC_SUBST(docdir)
 
 dnl Home-grown variables
 eval INITDIR="${INITDIR}"
 
 for j in prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir \
     sharedstatedir localstatedir libdir includedir oldincludedir infodir \
     mandir INITDIR docdir
 do 
   dirname=`eval echo '${'${j}'}'`
   if
     test ! -d "$dirname"
   then
     AC_MSG_WARN([$j directory ($dirname) does not exist!])
   fi
 done
 
 dnl This OS-based decision-making is poor autotools practice;
 dnl feature-based mechanisms are strongly preferred.
 dnl
 dnl So keep this section to a bare minimum; regard as a "necessary evil". 
 
 REBOOT_OPTIONS="-f"
 POWEROFF_OPTIONS="-f"
 
 case "$host_os" in
 *bsd*)		LIBS="-L/usr/local/lib"
 		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 		;;
 *solaris*)
 		REBOOT_OPTIONS="-n"
 		POWEROFF_OPTIONS="-n"
 		LDFLAGS+=" -lssp -lssp_nonshared"
 		;;
 *linux*)	
 		AC_DEFINE_UNQUOTED(ON_LINUX, 1, Compiling for Linux platform)
 		POWEROFF_OPTIONS="-nf"
 		REBOOT_OPTIONS="-nf"
  		;;
 darwin*)	
 		AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform)
   		LIBS="$LIBS -L${prefix}/lib"
   		CFLAGS="$CFLAGS -I${prefix}/include"
 		;;
 esac
 
 AC_DEFINE_UNQUOTED(HA_LOG_FACILITY, LOG_DAEMON, Default logging facility)
 
 AC_MSG_NOTICE(Host CPU: $host_cpu)
 
 case "$host_cpu" in
   ppc64|powerpc64)
     case $CFLAGS in
      *powerpc64*)			;;
      *)	if test "$GCC" = yes; then
 	  CFLAGS="$CFLAGS -m64"
 	fi				;;
     esac
 esac
 
 AC_MSG_CHECKING(which format is needed to print uint64_t)
 case "$host_cpu" in
   s390x)U64T="%lu";;
   *64*) U64T="%lu";;
   *)    U64T="%llu";;
 esac
 AC_MSG_RESULT($U64T)
 AC_DEFINE_UNQUOTED(U64T, "$U64T", Correct printf format for logging uint64_t)
 
 
 dnl Variables needed for substitution
 
 AC_CHECK_HEADERS(heartbeat/glue_config.h)
 
 if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
   OCF_ROOT_DIR=`extract_header_define heartbeat/glue_config.h OCF_ROOT_DIR`
 else
   enable_libnet=no
 fi
 
 AC_DEFINE_UNQUOTED(OCF_ROOT_DIR,"$OCF_ROOT_DIR", OCF root directory - specified by the OCF standard)
 AC_SUBST(OCF_ROOT_DIR)
 
 GLUE_STATE_DIR=${localstatedir}/run
 AC_DEFINE_UNQUOTED(GLUE_STATE_DIR,"$GLUE_STATE_DIR", Where to keep state files and sockets)
 AC_SUBST(GLUE_STATE_DIR)
 
 AC_DEFINE_UNQUOTED(HA_VARRUNDIR,"$GLUE_STATE_DIR", Where Heartbeat keeps state files and sockets - old name)
 HA_VARRUNDIR="$GLUE_STATE_DIR"
 AC_SUBST(HA_VARRUNDIR)
 
 # Expand $prefix
 eval HA_RSCTMPDIR="`eval echo ${HA_RSCTMPDIR}`"
 AC_DEFINE_UNQUOTED(HA_RSCTMPDIR,"$HA_RSCTMPDIR", Where Resouce agents keep state files)
 AC_SUBST(HA_RSCTMPDIR)
 
 dnl Eventually move out of the heartbeat dir tree and create symlinks when needed
 HA_VARLIBHBDIR=${localstatedir}/lib/heartbeat
 AC_DEFINE_UNQUOTED(HA_VARLIBHBDIR,"$HA_VARLIBHBDIR", Whatever this used to mean)
 AC_SUBST(HA_VARLIBHBDIR)
 
 OCF_RA_DIR="${OCF_ROOT_DIR}/resource.d"
 AC_DEFINE_UNQUOTED(OCF_RA_DIR,"$OCF_RA_DIR", Location for OCF RAs)
 AC_SUBST(OCF_RA_DIR)
 
 OCF_RA_DIR_PREFIX="$OCF_RA_DIR"
 AC_SUBST(OCF_RA_DIR_PREFIX)
 
 OCF_LIB_DIR="${OCF_ROOT_DIR}/lib"
 AC_DEFINE_UNQUOTED(OCF_LIB_DIR,"$OCF_LIB_DIR", Location for shared code for OCF RAs)
 AC_SUBST(OCF_LIB_DIR)
 
 OCF_LIB_DIR_PREFIX="$OCF_LIB_DIR"
 AC_SUBST(OCF_LIB_DIR_PREFIX)
 
 dnl ===============================================
 dnl rgmanager ras bits
 dnl ===============================================
 
 LOGDIR=${localstatedir}/log/cluster
 CLUSTERDATA=${datadir}/cluster
 
 AC_SUBST([LOGDIR])
 AC_SUBST([CLUSTERDATA])
 
 dnl ===============================================
 dnl Program Paths
 dnl ===============================================
 
 PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
 export PATH
 
 AC_CHECK_PROGS(MAKE, gmake make)
 AC_PATH_PROGS(BASH_SHELL, bash)
 if test x"${BASH_SHELL}" = x""; then
    AC_MSG_ERROR(You need bash installed in order to build ${PACKAGE})
 fi
 AC_PATH_PROGS(XSLTPROC, xsltproc)
 AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" )
 if test "x$XSLTPROC" = "x"; then
    AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages])
 fi
 AC_SUBST(XSLTPROC)
 AC_PATH_PROGS(XMLCATALOG, xmlcatalog)
 AC_PATH_PROGS(SSH, ssh, /usr/bin/ssh)
 AC_PATH_PROGS(SCP, scp, /usr/bin/scp)
 AC_PATH_PROGS(TAR, tar)
 AC_PATH_PROGS(MD5, md5)
 AC_PATH_PROGS(TEST, test)
 AC_PATH_PROGS(PING, ping, /bin/ping)
 AC_PATH_PROGS(IFCONFIG, ifconfig, /sbin/ifconfig)
 AC_PATH_PROGS(MAILCMD, mailx mail, mail)
 AC_PATH_PROGS(EGREP, egrep)
 AC_PATH_PROGS(RM, rm)
 
 AC_SUBST(BASH_SHELL)
 AC_SUBST(MAILCMD)
 AC_SUBST(EGREP)
 AC_SUBST(SHELL)
 AC_SUBST(PING)
 AC_SUBST(RM)
 AC_SUBST(TEST)
 
 AM_PATH_PYTHON
 if test -z "$PYTHON"; then
     echo "*** Essential program python not found" 1>&2
     exit 1
 fi
 
 AC_PATH_PROGS(ROUTE, route)
 AC_DEFINE_UNQUOTED(ROUTE, "$ROUTE", path to route command)
 
 AC_MSG_CHECKING(ifconfig option to list interfaces)
 for IFCONFIG_A_OPT in  "-A" "-a" ""
 do
   $IFCONFIG $IFCONFIG_A_OPT > /dev/null 2>&1
   if
     test "$?" = 0
   then
     AC_DEFINE_UNQUOTED(IFCONFIG_A_OPT, "$IFCONFIG_A_OPT", option for ifconfig command)
     AC_MSG_RESULT($IFCONFIG_A_OPT)
     break
   fi
 done
 
 AC_SUBST(IFCONFIG_A_OPT)
 
 if test x"${MAKE}" = x""; then
    AC_MSG_ERROR(You need (g)make installed in order to build ${PACKAGE})
 fi
 
 STYLESHEET_PREFIX=""
 if test x"${XSLTPROC}" != x""; then
     AC_MSG_CHECKING(docbook to manpage transform)
     # first try to figure out correct template using xmlcatalog query,
     # resort to extensive (semi-deterministic) file search if that fails
     DOCBOOK_XSL_URI='http://docbook.sourceforge.net/release/xsl/current'
     DOCBOOK_XSL_PATH='manpages/docbook.xsl'
     STYLESHEET_PREFIX=$(${XMLCATALOG} "" ${DOCBOOK_XSL_URI} \
                    | sed -n 's|^file://||p;q')
     if test x"${STYLESHEET_PREFIX}" = x""; then
         DIRS=$(find "${datadir}" -name $(basename $(dirname ${DOCBOOK_XSL_PATH})) \
                -type d | LC_ALL=C sort)
         XSLT=$(basename ${DOCBOOK_XSL_PATH})
         for d in ${DIRS}; do
             if test -f "${d}/${XSLT}"; then
                  STYLESHEET_PREFIX=$(echo "${d}" | sed 's/\/manpages//')
                  break
             fi
         done
     fi
     if test x"${STYLESHEET_PREFIX}" = x""; then
         AC_MSG_ERROR(You need docbook-style-xsl installed in order to build ${PACKAGE})
     fi
 fi
 AC_MSG_RESULT($STYLESHEET_PREFIX)
 AC_SUBST(STYLESHEET_PREFIX)
 
 dnl ===============================================
 dnl Libraries
 dnl ===============================================
 AC_CHECK_LIB(socket, socket)			
 AC_CHECK_LIB(gnugetopt, getopt_long)		dnl if available
 
 if test "x${enable_thread_safe}" = "xyes"; then
         GPKGNAME="gthread-2.0"
 else
         GPKGNAME="glib-2.0"
 fi
 
 if 
    $PKGCONFIG --exists $GPKGNAME
 then
 	GLIBCONFIG="$PKGCONFIG $GPKGNAME"
 else
 	set -x
         echo PKG_CONFIG_PATH=$PKG_CONFIG_PATH
 	$PKGCONFIG --exists $GPKGNAME; echo $?
 	$PKGCONFIG --cflags $GPKGNAME; echo $?
 	$PKGCONFIG $GPKGNAME; echo $?
 	set +x
         
 	AC_MSG_ERROR(You need glib2-devel installed in order to build ${PACKAGE})
 fi
 AC_MSG_RESULT(using $GLIBCONFIG)
 
 if test "X$GLIBCONFIG" != X; then
 	AC_MSG_CHECKING(for special glib includes: )
 	GLIBHEAD=`$GLIBCONFIG --cflags`
 	AC_MSG_RESULT($GLIBHEAD)
 	CPPFLAGS="$CPPFLAGS $GLIBHEAD"
 
 	AC_MSG_CHECKING(for glib library flags)
 	GLIBLIB=`$GLIBCONFIG --libs`
 	AC_MSG_RESULT($GLIBLIB)
 	LIBS="$LIBS $GLIBLIB"
 fi
 
 dnl ========================================================================
 dnl Headers
 dnl ========================================================================
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/socket.h)
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CHECK_HEADERS([arpa/inet.h])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([limits.h])
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_HEADERS([netdb.h])
 AC_CHECK_HEADERS([netinet/in.h])
 AC_CHECK_HEADERS([sys/file.h])
 AC_CHECK_HEADERS([sys/ioctl.h])
 AC_CHECK_HEADERS([sys/param.h])
 AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([syslog.h])
 
 dnl ========================================================================
 dnl Functions
 dnl ========================================================================
 
 AC_FUNC_FORK
 AC_FUNC_STRNLEN
 AC_CHECK_FUNCS([alarm gettimeofday inet_ntoa memset mkdir socket uname])
 AC_CHECK_FUNCS([strcasecmp strchr strdup strerror strrchr strspn strstr strtol strtoul])
 
 AC_PATH_PROGS(REBOOT, reboot, /sbin/reboot)
 AC_SUBST(REBOOT)
 AC_SUBST(REBOOT_OPTIONS)
 AC_DEFINE_UNQUOTED(REBOOT, "$REBOOT", path to the reboot command)
 AC_DEFINE_UNQUOTED(REBOOT_OPTIONS, "$REBOOT_OPTIONS", reboot options)
 
 AC_PATH_PROGS(POWEROFF_CMD, poweroff, /sbin/poweroff)
 AC_SUBST(POWEROFF_CMD)
 AC_SUBST(POWEROFF_OPTIONS)
 AC_DEFINE_UNQUOTED(POWEROFF_CMD, "$POWEROFF_CMD", path to the poweroff command)
 AC_DEFINE_UNQUOTED(POWEROFF_OPTIONS, "$POWEROFF_OPTIONS", poweroff options)
 
 AC_PATH_PROGS(POD2MAN, pod2man)
 AM_CONDITIONAL(BUILD_POD_DOC, test "x$POD2MAN" != "x" )
 if test "x$POD2MAN" = "x"; then
    AC_MSG_WARN([pod2man not installed, unable to (re-)build ldirector manual page])
 fi
 AC_SUBST(POD2MAN)
 
 dnl ========================================================================
 dnl Functions
 dnl ========================================================================
 
 AC_CHECK_FUNCS(getopt, AC_DEFINE(HAVE_DECL_GETOPT,  1, [Have getopt function]))
 
 dnl ========================================================================
 dnl   sfex
 dnl ========================================================================
 
 build_sfex=no
 case $host_os in
     *Linux*|*linux*) 
 	if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
 	    build_sfex=yes
 	fi
 	;;
 esac
 
 AM_CONDITIONAL(BUILD_SFEX, test "$build_sfex" = "yes" )
 
 
 dnl ========================================================================
 dnl   tickle (needs port to BSD platforms)
 dnl ========================================================================
 
 AC_CHECK_MEMBERS([struct iphdr.saddr],,,[[#include <netinet/ip.h>]])
 AM_CONDITIONAL(BUILD_TICKLE, test "$ac_cv_member_struct_iphdr_saddr" = "yes" )
 
 dnl ========================================================================
 dnl   libnet
 dnl ========================================================================
 
 libnet=""
 libnet_version="none"
 LIBNETLIBS=""
 LIBNETDEFINES=""
 
 AC_MSG_CHECKING(if libnet is required)
 libnet_fatal=$enable_libnet
 case $enable_libnet in
      no) ;;
      yes|libnet10|libnet11|10|11) libnet_fatal=yes;;
      try)
 	case $host_os in
 	     *Linux*|*linux*) libnet_fatal=no;;
 	     *) libnet_fatal=yes;; dnl legacy behavior
 	esac
 	;;
      *) libnet_fatal=yes; enable_libnet=try;;
 esac
 AC_MSG_RESULT($libnet_fatal)
 
 if test "x$enable_libnet" != "xno"; then
    AC_PATH_PROGS(LIBNETCONFIG, libnet-config)
 
    AC_CHECK_LIB(nsl, t_open)			dnl -lnsl
    AC_CHECK_LIB(socket, socket)			dnl -lsocket
    AC_CHECK_LIB(net, libnet_get_hwaddr, LIBNETLIBS=" -lnet", [])
  fi
  
 AC_MSG_CHECKING(for libnet)
 if test "x$LIBNETLIBS" != "x" -o "x$enable_libnet" = "xlibnet11"; then
       LIBNETDEFINES=""
       if test "$ac_cv_lib_nsl_t_open" = yes; then
          LIBNETLIBS="-lnsl $LIBNETLIBS"
       fi
       if test "$ac_cv_lib_socket_socket" = yes; then
          LIBNETLIBS="-lsocket $LIBNETLIBS"
       fi
 
       libnet=net
       libnet_version="libnet1.1"
 fi
 
 if test "x$enable_libnet" = "xtry" -o "x$enable_libnet" = "xlibnet10"; then
    if test "x$LIBNETLIBS" = x -a "x${LIBNETCONFIG}" != "x" ; then
       LIBNETDEFINES="`$LIBNETCONFIG --defines` `$LIBNETCONFIG --cflags`";
       LIBNETLIBS="`$LIBNETCONFIG --libs`";
       libnet_version="libnet1.0 (old)"
       case $LIBNETLIBS in
         *-l*)	libnet=`echo $LIBNETLIBS | sed 's%.*-l%%'`;;
         *)	libnet_version=none;;
       esac
 
       CPPFLAGS="$CPPFLAGS $LIBNETDEFINES"
 
       AC_CHECK_HEADERS(libnet.h)
       if test "$ac_cv_header_libnet_h" = no; then
 	libnet_version=none
       fi
    fi
 fi
 AC_MSG_RESULT(found $libnet_version)
 
 if test "$libnet_version" = none; then
    LIBNETLIBS=""
    LIBNETDEFINES=""
    if test $libnet_fatal = yes; then
         AC_MSG_ERROR(libnet not found)
    fi
 
 else
    AC_CHECK_LIB($libnet,libnet_init,
       [new_libnet=yes; AC_DEFINE(HAVE_LIBNET_1_1_API, 1, Libnet 1.1 API)],
       [new_libnet=no; AC_DEFINE(HAVE_LIBNET_1_0_API, 1, Libnet 1.0 API)],$LIBNETLIBS)
    AC_SUBST(LIBNETLIBS)
 fi
 
 if test "$new_libnet" = yes; then
    AC_MSG_CHECKING(for libnet API 1.1.4: )
    save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -fgnu89-inline -Wall -Werror"
    AC_COMPILE_IFELSE([
 	AC_LANG_SOURCE(#include <libnet.h>
 			  int main(){libnet_t *l=NULL; libnet_pblock_record_ip_offset(l, l->total_size); return(0); })],
       [AC_MSG_RESULT(no)],
       [AC_DEFINE(HAVE_LIBNET_1_1_4_API, 1, Libnet 1.1.4 API) AC_MSG_RESULT(yes)])
    CFLAGS="$save_CFLAGS"
 fi
 
 sendarp_linux=0
 case $host_os in
      *Linux*|*linux*) sendarp_linux=1;;
 esac
 
 AC_SUBST(LIBNETLIBS)
 AC_SUBST(LIBNETDEFINES)
 
 AM_CONDITIONAL(SENDARP_LINUX, test $sendarp_linux = 1 )
 AM_CONDITIONAL(USE_LIBNET, test "x$libnet_version" != "xnone" )
 
 dnl ************************************************************************
 dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
 AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
 AM_CONDITIONAL(USE_IPV6ADDR_AGENT, test "$ac_cv_header_netinet_icmp6_h" = yes && test "$ac_cv_header_heartbeat_glue_config_h" = yes)
 AM_CONDITIONAL(IPV6ADDR_COMPATIBLE, test "$ac_cv_header_netinet_icmp6_h" = yes)
 
 dnl ========================================================================
 dnl Compiler flags
 dnl ========================================================================
 
 dnl Make sure that CFLAGS is not exported. If the user did
 dnl not have CFLAGS in their environment then this should have
 dnl no effect. However if CFLAGS was exported from the user's
 dnl environment, then the new CFLAGS will also be exported
 dnl to sub processes.
 
 CC_ERRORS=""
 CC_EXTRAS=""
 
 if export -p | fgrep " CFLAGS=" > /dev/null; then
 	SAVED_CFLAGS="$CFLAGS"
 	unset CFLAGS
 	CFLAGS="$SAVED_CFLAGS"
 	unset SAVED_CFLAGS
 fi
 
 if test "$GCC" != yes; then
         CFLAGS="$CFLAGS -g"
 	enable_fatal_warnings=no
 else
         CFLAGS="$CFLAGS -ggdb3"
 
 	# We had to eliminate -Wnested-externs because of libtool changes
 	# Also remove -Waggregate-return because we use one libnet
 	# call which returns a struct
         EXTRA_FLAGS="-fgnu89-inline
 		-fstack-protector-all
 		-Wall
 		-Wbad-function-cast 
 		-Wcast-qual 
 		-Wdeclaration-after-statement
 		-Wendif-labels
 		-Wfloat-equal
 		-Wformat=2
 		-Wformat-security
 		-Wformat-nonliteral
 		-Winline
 		-Wmissing-prototypes 
 		-Wmissing-declarations 
 		-Wmissing-format-attribute
 		-Wnested-externs
 		-Wno-long-long
 		-Wno-strict-aliasing
 		-Wpointer-arith 
 		-Wstrict-prototypes
 		-Wunsigned-char
 		-Wwrite-strings"
 
 # Additional warnings it might be nice to enable one day
 #		-Wshadow
 #		-Wunreachable-code
 
 	for j in $EXTRA_FLAGS
 	do
 	  if
 	    cc_supports_flag $j
 	  then
 	    CC_EXTRAS="$CC_EXTRAS $j"
 	  fi
 	done
 
 dnl In lib/ais/Makefile.am there's a gcc option available as of v4.x
 
 	GCC_MAJOR=`gcc -v 2>&1 | awk 'END{print $3}' | sed 's/[.].*//'`
 	AM_CONDITIONAL(GCC_4, test "${GCC_MAJOR}" = 4)
 
 dnl System specific options
 
 	case "$host_os" in
   	*linux*|*bsd*)
 		if test "${enable_fatal_warnings}" = "unknown"; then
         		enable_fatal_warnings=yes
         	fi
           	;;
 	esac
 
 	if test "x${enable_fatal_warnings}" != xno && cc_supports_flag -Werror ; then
 	   enable_fatal_warnings=yes
 	else
 	   enable_fatal_warnings=no
         fi
 
 	if test "x${enable_ansi}" != xno && cc_supports_flag -std=iso9899:199409 ; then
 	  AC_MSG_NOTICE(Enabling ANSI Compatibility)
 	  CC_EXTRAS="$CC_EXTRAS -ansi -D_GNU_SOURCE -DANSI_ONLY"
 	fi
 
   	AC_MSG_NOTICE(Activated additional gcc flags: ${CC_EXTRAS})
 fi
 
 CFLAGS="$CFLAGS $CC_EXTRAS"
 
 NON_FATAL_CFLAGS="$CFLAGS"
 AC_SUBST(NON_FATAL_CFLAGS)
 
 dnl
 dnl We reset CFLAGS to include our warnings *after* all function
 dnl checking goes on, so that our warning flags don't keep the
 dnl AC_*FUNCS() calls above from working.  In particular, -Werror will
 dnl *always* cause us troubles if we set it before here.
 dnl
 dnl
 if test "x${enable_fatal_warnings}" = xyes ; then
    AC_MSG_NOTICE(Enabling Fatal Warnings)
    CFLAGS="$CFLAGS -Werror"
 fi
 AC_SUBST(CFLAGS)
 
 dnl This is useful for use in Makefiles that need to remove one specific flag
 CFLAGS_COPY="$CFLAGS"
 AC_SUBST(CFLAGS_COPY)
 
 AC_SUBST(LOCALE)
 
 AC_SUBST(CC)
 AC_SUBST(MAKE)
 
 dnl The Makefiles and shell scripts we output
 AC_CONFIG_FILES(Makefile				        \
 include/Makefile						\
 heartbeat/Makefile						\
    heartbeat/ocf-binaries					\
    heartbeat/ocf-directories					\
    heartbeat/ocf-shellfuncs					\
    heartbeat/shellfuncs						\
 systemd/Makefile						\
 tools/Makefile							\
    tools/ocf-tester						\
    tools/ocft/Makefile						\
    tools/ocft/ocft						\
    tools/ocft/caselib						\
    tools/ocft/README						\
    tools/ocft/README.zh_CN					\
 ldirectord/Makefile						\
 ldirectord/ldirectord   					\
 	ldirectord/init.d/Makefile				\
 	ldirectord/init.d/ldirectord   				\
 	ldirectord/init.d/ldirectord.debian			\
 	ldirectord/init.d/ldirectord.debian.default		\
 	ldirectord/systemd/Makefile	\
 	ldirectord/systemd/ldirectord.service	\
 	ldirectord/logrotate.d/Makefile				\
 	ldirectord/OCF/Makefile					\
 	ldirectord/OCF/ldirectord				\
 doc/Makefile							\
 	doc/man/Makefile					\
 rgmanager/Makefile						\
 	rgmanager/src/Makefile					\
 	rgmanager/src/resources/Makefile			\
 		rgmanager/src/resources/ocf-shellfuncs		\
 		rgmanager/src/resources/svclib_nfslock		\
 		rgmanager/src/resources/lvm_by_lv.sh		\
 		rgmanager/src/resources/lvm_by_vg.sh		\
 	rgmanager/src/resources/utils/Makefile			\
 		rgmanager/src/resources/utils/fs-lib.sh		\
 		rgmanager/src/resources/utils/messages.sh	\
 		rgmanager/src/resources/utils/config-utils.sh	\
 		rgmanager/src/resources/utils/member_util.sh	\
 		rgmanager/src/resources/utils/ra-skelet.sh	\
 		)
 
 dnl Files we output that need to be executable
 AC_CONFIG_FILES([heartbeat/AoEtarget], [chmod +x heartbeat/AoEtarget])
 AC_CONFIG_FILES([heartbeat/ManageRAID], [chmod +x heartbeat/ManageRAID])
 AC_CONFIG_FILES([heartbeat/ManageVE], [chmod +x heartbeat/ManageVE])
 AC_CONFIG_FILES([heartbeat/Squid], [chmod +x heartbeat/Squid])
 AC_CONFIG_FILES([heartbeat/SysInfo], [chmod +x heartbeat/SysInfo])
 AC_CONFIG_FILES([heartbeat/aws-vpc-route53], [chmod +x heartbeat/aws-vpc-route53])
 AC_CONFIG_FILES([heartbeat/clvm], [chmod +x heartbeat/clvm])
 AC_CONFIG_FILES([heartbeat/conntrackd], [chmod +x heartbeat/conntrackd])
 AC_CONFIG_FILES([heartbeat/dnsupdate], [chmod +x heartbeat/dnsupdate])
 AC_CONFIG_FILES([heartbeat/eDir88], [chmod +x heartbeat/eDir88])
 AC_CONFIG_FILES([heartbeat/fio], [chmod +x heartbeat/fio])
 AC_CONFIG_FILES([heartbeat/gcp-vpc-move-ip], [chmod +x heartbeat/gcp-vpc-move-ip])
 AC_CONFIG_FILES([heartbeat/gcp-vpc-move-vip], [chmod +x heartbeat/gcp-vpc-move-vip])
 AC_CONFIG_FILES([heartbeat/gcp-vpc-move-route], [chmod +x heartbeat/gcp-vpc-move-route])
 AC_CONFIG_FILES([heartbeat/iSCSILogicalUnit], [chmod +x heartbeat/iSCSILogicalUnit])
 AC_CONFIG_FILES([heartbeat/iSCSITarget], [chmod +x heartbeat/iSCSITarget])
 AC_CONFIG_FILES([heartbeat/jira], [chmod +x heartbeat/jira])
 AC_CONFIG_FILES([heartbeat/kamailio], [chmod +x heartbeat/kamailio])
 AC_CONFIG_FILES([heartbeat/lxc], [chmod +x heartbeat/lxc])
 AC_CONFIG_FILES([heartbeat/lxd-info], [chmod +x heartbeat/lxd-info])
 AC_CONFIG_FILES([heartbeat/machine-info], [chmod +x heartbeat/machine-info])
 AC_CONFIG_FILES([heartbeat/mariadb], [chmod +x heartbeat/mariadb])
 AC_CONFIG_FILES([heartbeat/mpathpersist], [chmod +x heartbeat/mpathpersist])
 AC_CONFIG_FILES([heartbeat/nfsnotify], [chmod +x heartbeat/nfsnotify])
 AC_CONFIG_FILES([heartbeat/redis], [chmod +x heartbeat/redis])
 AC_CONFIG_FILES([heartbeat/rsyslog], [chmod +x heartbeat/rsyslog])
 AC_CONFIG_FILES([heartbeat/sg_persist], [chmod +x heartbeat/sg_persist])
 AC_CONFIG_FILES([heartbeat/slapd], [chmod +x heartbeat/slapd])
 AC_CONFIG_FILES([heartbeat/sybaseASE], [chmod +x heartbeat/sybaseASE])
 AC_CONFIG_FILES([heartbeat/syslog-ng], [chmod +x heartbeat/syslog-ng])
 AC_CONFIG_FILES([heartbeat/vsftpd], [chmod +x heartbeat/vsftpd])
+AC_CONFIG_FILES([heartbeat/CTDB], [chmod +x heartbeat/CTDB])
 AC_CONFIG_FILES([rgmanager/src/resources/ASEHAagent.sh], [chmod +x rgmanager/src/resources/ASEHAagent.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/apache.sh], [chmod +x rgmanager/src/resources/apache.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/bind-mount.sh], [chmod +x rgmanager/src/resources/bind-mount.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/clusterfs.sh], [chmod +x rgmanager/src/resources/clusterfs.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/db2.sh], [chmod +x rgmanager/src/resources/db2.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/drbd.sh], [chmod +x rgmanager/src/resources/drbd.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/fs.sh], [chmod +x rgmanager/src/resources/fs.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/ip.sh], [chmod +x rgmanager/src/resources/ip.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/lvm.sh], [chmod +x rgmanager/src/resources/lvm.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/mysql.sh], [chmod +x rgmanager/src/resources/mysql.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/named.sh], [chmod +x rgmanager/src/resources/named.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/netfs.sh], [chmod +x rgmanager/src/resources/netfs.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/nfsclient.sh], [chmod +x rgmanager/src/resources/nfsclient.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/nfsexport.sh], [chmod +x rgmanager/src/resources/nfsexport.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/nfsserver.sh], [chmod +x rgmanager/src/resources/nfsserver.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/openldap.sh], [chmod +x rgmanager/src/resources/openldap.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/oracledb.sh], [chmod +x rgmanager/src/resources/oracledb.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/oradg.sh], [chmod +x rgmanager/src/resources/oradg.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/orainstance.sh], [chmod +x rgmanager/src/resources/orainstance.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/oralistener.sh], [chmod +x rgmanager/src/resources/oralistener.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/postgres-8.sh], [chmod +x rgmanager/src/resources/postgres-8.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/samba.sh], [chmod +x rgmanager/src/resources/samba.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/script.sh], [chmod +x rgmanager/src/resources/script.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/service.sh], [chmod +x rgmanager/src/resources/service.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/smb.sh], [chmod +x rgmanager/src/resources/smb.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/tomcat-5.sh], [chmod +x rgmanager/src/resources/tomcat-5.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/tomcat-6.sh], [chmod +x rgmanager/src/resources/tomcat-6.sh])
 AC_CONFIG_FILES([rgmanager/src/resources/vm.sh], [chmod +x rgmanager/src/resources/vm.sh])
 
 dnl Now process the entire list of files added by previous 
 dnl  calls to AC_CONFIG_FILES()
 AC_OUTPUT()
 
 dnl *****************
 dnl Configure summary
 dnl *****************
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE configuration:])
 AC_MSG_RESULT([  Version                  = ${VERSION}])
 AC_MSG_RESULT([  Build Version            = $Format:%H$])
 AC_MSG_RESULT([  Features                 =${PKG_FEATURES}])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([  Prefix                   = ${prefix}])
 AC_MSG_RESULT([  Executables              = ${sbindir}])
 AC_MSG_RESULT([  Man pages                = ${mandir}])
 AC_MSG_RESULT([  Libraries                = ${libdir}])
 AC_MSG_RESULT([  Header files             = ${includedir}])
 AC_MSG_RESULT([  Arch-independent files   = ${datadir}])
 AC_MSG_RESULT([  Documentation            = ${docdir}])
 AC_MSG_RESULT([  State information        = ${localstatedir}])
 AC_MSG_RESULT([  System configuration     = ${sysconfdir}])
 AC_MSG_RESULT([  HA_BIN directory prefix  = ${libexecdir}])
 AC_MSG_RESULT([  RA state files           = ${HA_RSCTMPDIR}])
 AC_MSG_RESULT([  AIS Plugins              = ${LCRSODIR}])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([  CFLAGS                   = ${CFLAGS}])
 AC_MSG_RESULT([  Libraries                = ${LIBS}])
 AC_MSG_RESULT([  Stack Libraries          = ${CLUSTERLIBS}])
 
diff --git a/heartbeat/CTDB b/heartbeat/CTDB.in
similarity index 96%
rename from heartbeat/CTDB
rename to heartbeat/CTDB.in
index 1456ea32b..f9b5c564f 100755
--- a/heartbeat/CTDB
+++ b/heartbeat/CTDB.in
@@ -1,799 +1,800 @@
-#!/bin/sh
+#!@BASH_SHELL@
 #
 #             OCF Resource Agent for managing CTDB
 #
 # Copyright (c) 2009-2010 Novell Inc., Tim Serong
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 #
 # OVERVIEW
 #
 # When run by itself, CTDB can handle IP failover and includes scripts
 # to manage various services (Samba, Winbind, HTTP, etc.).  When run as
 # a resource in a Pacemaker cluster, this additional functionality
 # should not be used; instead one should define separate resources for
 # CTDB, Samba, Winbind, IP addresses, etc.
 #
 # As of 2010-11-17, there is no separate OCF Samba or Winbind RA, so
 # it is still possible to configure CTDB so that it manages these
 # resources itself.  In future, once Samba and Winbind RAs are
 # available, this ability will be deprecated and ultimately removed.
 #
 # This RA intentionally provides no ability to configure CTDB such that
 # it manages IP failover, HTTP, NFS, etc.
 #
 #
 # TODO:
 # - ctdb_stop doesn't really support multiple independent CTDB instances,
 #   unless they're running from distinct ctdbd binaries (it uses pkill
 #   $OCF_RESKEY_ctdbd_binary if "ctdb stop" doesn't work, which it might
 #   not under heavy load - this will kill all ctdbd instances on the
 #   system).  OTOH, running multiple CTDB instances per node is, well,
 #   AFAIK, completely crazy.  Can't run more than one in a vanilla CTDB
 #   cluster, with the CTDB init script.  So it might be nice to address
 #   this for complete semantic correctness of the RA, but shouldn't
 #   actually cause any trouble in real life.
 # - As much as possible, get rid of auto config generation
 #   - Especially smb.conf
 # - Verify timeouts are sane
 # - Monitor differentiate between error and not running?
 # - Do we need to verify globally unique setting?
 # - Should set CTDB_NODES to ${HA_RSCTMP}/ctdb (generated based on
 #   current nodes)
 # - Look at enabling set_ctdb_variables() if necessary.
 # - Probably possible for sysconfig file to not be restored if
 #   CTDB dies unexpectedly.
 #
 #######################################################################
 # Initialization:
 
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 #######################################################################
 # Default parameter values:
 
 # Some distro's ctdb package stores the persistent db in /var/lib/ctdb,
 # others store in /var/ctdb. This attempts to detect the correct default
 # directory.
 var_prefix="/var/lib/ctdb"
 if [ ! -d "$var_prefix" ] && [ -d "/var/ctdb" ]; then
 	var_prefix="/var/ctdb"
 fi
 
 run_prefix="/run"
 if [ ! -d "$var_prefix" ] && [ -d "/var/run" ]; then
 	var_prefix="/var/run"
 fi
 
 : ${OCF_RESKEY_ctdb_manages_samba:=no}
 : ${OCF_RESKEY_ctdb_manages_winbind:=no}
 : ${OCF_RESKEY_ctdb_service_smb:=""}
 : ${OCF_RESKEY_ctdb_service_nmb:=""}
 : ${OCF_RESKEY_ctdb_service_winbind:=""}
 : ${OCF_RESKEY_ctdb_samba_skip_share_check:=yes}
 : ${OCF_RESKEY_ctdb_monitor_free_memory:=100}
 : ${OCF_RESKEY_ctdb_start_as_disabled:=no}
 
 : ${OCF_RESKEY_ctdb_config_dir:=/etc/ctdb}
 : ${OCF_RESKEY_ctdb_binary:=/usr/bin/ctdb}
 : ${OCF_RESKEY_ctdbd_binary:=/usr/sbin/ctdbd}
 : ${OCF_RESKEY_ctdb_dbdir:=${var_prefix}}
 : ${OCF_RESKEY_ctdb_logfile:=/var/log/ctdb/log.ctdb}
 : ${OCF_RESKEY_ctdb_rundir:=${run_prefix}/ctdb}
 : ${OCF_RESKEY_ctdb_socket:=${OCF_RESKEY_ctdb_rundir}/ctdbd.socket}
 : ${OCF_RESKEY_ctdb_debuglevel:=2}
 
 : ${OCF_RESKEY_smb_conf:=/etc/samba/smb.conf}
 : ${OCF_RESKEY_smb_passdb_backend:=tdbsam}
 : ${OCF_RESKEY_smb_idmap_backend:=tdb2}
 
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="CTDB">
 <version>1.0</version>
 
 <longdesc lang="en">
 This resource agent manages CTDB, allowing one to use Clustered Samba in a
 Linux-HA/Pacemaker cluster.  You need a shared filesystem (e.g. OCFS2 or GFS2) on
 which the CTDB lock will be stored.  Create /etc/ctdb/nodes containing a list
 of private IP addresses of each node in the cluster, then configure this RA
 as a clone.  This agent expects the samba and windbind resources
 to be managed outside of CTDB's control as a separate set of resources controlled
 by the cluster manager.  The optional support for enabling CTDB management of these
 daemons will be depreciated.
 
 For more information see http://linux-ha.org/wiki/CTDB_(resource_agent)
 </longdesc>
 <shortdesc lang="en">CTDB Resource Agent</shortdesc>
 
 <parameters>
 
 <parameter name="ctdb_recovery_lock" unique="1" required="1">
 <longdesc lang="en">
-The location of a shared lock file, common across all nodes.
-This must be on shared storage, e.g.: /shared-fs/samba/ctdb.lock
+The location of a shared lock file or helper binary, common across all nodes.
+See CTDB documentation for details.
 </longdesc>
 <shortdesc lang="en">CTDB shared lock file</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="ctdb_manages_samba" unique="0" required="0">
 <longdesc lang="en">
 Should CTDB manage starting/stopping the Samba service for you?
 This will be deprecated in future, in favor of configuring a
 separate Samba resource.
 </longdesc>
 <shortdesc lang="en">Should CTDB manage Samba?</shortdesc>
 <content type="boolean" default="no" />
 </parameter>
 
 <parameter name="ctdb_manages_winbind" unique="0" required="0">
 <longdesc lang="en">
 Should CTDB manage starting/stopping the Winbind service for you?
 This will be deprecated in future, in favor of configuring a
 separate Winbind resource.
 </longdesc>
 <shortdesc lang="en">Should CTDB manage Winbind?</shortdesc>
 <content type="boolean" default="no" />
 </parameter>
 
 <parameter name="ctdb_service_smb" unique="0" required="0">
 <longdesc lang="en">
 Name of smb init script.  Only necessary if CTDB is managing
 Samba directly.  Will usually be auto-detected.
 </longdesc>
 <shortdesc lang="en">Name of smb init script</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="ctdb_service_nmb" unique="0" required="0">
 <longdesc lang="en">
 Name of nmb init script.  Only necessary if CTDB is managing
 Samba directly.  Will usually be auto-detected.
 </longdesc>
 <shortdesc lang="en">Name of nmb init script</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="ctdb_service_winbind" unique="0" required="0">
 <longdesc lang="en">
 Name of winbind init script.  Only necessary if CTDB is managing
 Winbind directly.  Will usually be auto-detected.
 </longdesc>
 <shortdesc lang="en">Name of winbind init script</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="ctdb_samba_skip_share_check" unique="0" required="0">
 <longdesc lang="en">
 If there are very many shares it may not be feasible to check that all
 of them are available during each monitoring interval.  In that case
 this check can be disabled.
 </longdesc>
 <shortdesc lang="en">Skip share check during monitor?</shortdesc>
 <content type="boolean" default="yes" />
 </parameter>
 
 <parameter name="ctdb_monitor_free_memory" unique="0" required="0">
 <longdesc lang="en">
 If the amount of free memory drops below this value the node will
 become unhealthy and ctdb and all managed services will be shutdown.
 Once this occurs, the administrator needs to find the reason for the
 OOM situation, rectify it and restart ctdb with "service ctdb start".
 </longdesc>
 <shortdesc lang="en">Minimum amount of free memory (MB)</shortdesc>
 <content type="integer" default="100" />
 </parameter>
 
 <parameter name="ctdb_start_as_disabled" unique="0" required="0">
 <longdesc lang="en">
 When set to yes, the CTDB node will start in DISABLED mode and not
 host any public ip addresses.
 </longdesc>
 <shortdesc lang="en">Start CTDB disabled?</shortdesc>
 <content type="boolean" default="no" />
 </parameter>
 
 <parameter name="ctdb_config_dir" unique="0" required="0">
 <longdesc lang="en">
 The directory containing various CTDB configuration files.
 The "nodes" and "notify.sh" scripts are expected to be
 in this directory, as is the "events.d" subdirectory.
 </longdesc>
 <shortdesc lang="en">CTDB config file directory</shortdesc>
 <content type="string" default="/etc/ctdb" />
 </parameter>
 
 <parameter name="ctdb_binary" unique="0" required="0">
 <longdesc lang="en">
 Full path to the CTDB binary.
 </longdesc>
 <shortdesc lang="en">CTDB binary path</shortdesc>
 <content type="string" default="/usr/bin/ctdb" />
 </parameter>
 
 <parameter name="ctdbd_binary" unique="0" required="0">
 <longdesc lang="en">
 Full path to the CTDB cluster daemon binary.
 </longdesc>
 <shortdesc lang="en">CTDB Daemon binary path</shortdesc>
 <content type="string" default="/usr/sbin/ctdbd" />
 </parameter>
 
 <parameter name="ctdb_socket" unique="1" required="0">
 <longdesc lang="en">
 Full path to the domain socket that ctdbd will create, used for
 local clients to attach and communicate with the ctdb daemon.
 </longdesc>
 <shortdesc lang="en">CTDB socket location</shortdesc>
 <content type="string" default="${OCF_RESKEY_ctdb_socket}" />
 </parameter>
 
 <parameter name="ctdb_dbdir" unique="1" required="0">
 <longdesc lang="en">
 The directory to put the local CTDB database files in.
 Persistent database files will be put in ctdb_dbdir/persistent.
 </longdesc>
 <shortdesc lang="en">CTDB database directory</shortdesc>
 <content type="string" default="${OCF_RESKEY_ctdb_dbdir}" />
 </parameter>
 
 <parameter name="ctdb_logfile" unique="0" required="0">
 <longdesc lang="en">
 Full path to log file. To log to syslog instead, use the
 value "syslog".
 </longdesc>
 <shortdesc lang="en">CTDB log file location</shortdesc>
 <content type="string" default="/var/log/ctdb/log.ctdb" />
 </parameter>
 
 <parameter name="ctdb_rundir" unique="0" required="0">
 <longdesc lang="en">
 Full path to ctdb runtime directory, used for storage of socket
 lock state.
 </longdesc>
 <shortdesc lang="en">CTDB runtime directory location</shortdesc>
 <content type="string" default="${OCF_RESKEY_ctdb_rundir}" />
 </parameter>
 
 <parameter name="ctdb_debuglevel" unique="0" required="0">
 <longdesc lang="en">
 What debug level to run at (0-10). Higher means more verbose.
 </longdesc>
 <shortdesc lang="en">CTDB debug level</shortdesc>
 <content type="integer" default="2" />
 </parameter>
 
 <parameter name="smb_conf" unique="0" required="0">
 <longdesc lang="en">
 Path to default samba config file.  Only necessary if CTDB
 is managing Samba.
 </longdesc>
 <shortdesc lang="en">Path to smb.conf</shortdesc>
 <content type="string" default="/etc/samba/smb.conf" />
 </parameter>
 
 <parameter name="smb_private_dir" unique="1" required="0">
 <longdesc lang="en">
 The directory for smbd to use for storing such files as
 smbpasswd and secrets.tdb.  Old versions of CTBD (prior to 1.0.50)
 required this to be on shared storage.  This parameter should not
 be set for current versions of CTDB, and only remains in the RA
 for backwards compatibility.
 </longdesc>
 <shortdesc lang="en">Samba private dir (deprecated)</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="smb_passdb_backend" unique="0" required="0">
 <longdesc lang="en">
 Which backend to use for storing user and possibly group
 information.  Only necessary if CTDB is managing Samba.
 </longdesc>
 <shortdesc lang="en">Samba passdb backend</shortdesc>
 <content type="string" default="tdbsam" />
 </parameter>
 
 <parameter name="smb_idmap_backend" unique="0" required="0">
 <longdesc lang="en">
 Which backend to use for SID/uid/gid mapping.  Only necessary
 if CTDB is managing Samba.
 </longdesc>
 <shortdesc lang="en">Samba idmap backend</shortdesc>
 <content type="string" default="tdb2" />
 </parameter>
 
 <parameter name="smb_fileid_algorithm" unique="0" required="0">
 <longdesc lang="en">
 Which fileid:algorithm to use with vfs_fileid.  The correct
 value depends on which clustered filesystem is in use, e.g.:
 for OCFS2, this should be set to "fsid".  Only necessary if
 CTDB is managing Samba.
 </longdesc>
 <shortdesc lang="en">Samba VFS fileid algorithm</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"        timeout="90s" />
 <action name="stop"         timeout="100s" />
 <action name="monitor"      timeout="20s" interval="10s" depth="0" />
 <action name="meta-data"    timeout="5s" />
 <action name="validate-all"   timeout="30s" />
 </actions>
 </resource-agent>
 END
 }
 
 #######################################################################
 
 # Figure out path to /etc/sysconfig/ctdb (same logic as
 # loadconfig() from /etc/ctdb/functions
 if [ -f /etc/sysconfig/ctdb ]; then
 	CTDB_SYSCONFIG=/etc/sysconfig/ctdb
 elif [ -f /etc/default/ctdb ]; then
 	CTDB_SYSCONFIG=/etc/default/ctdb
 elif [ -f "$OCF_RESKEY_ctdb_config_dir/ctdb" ]; then
 	CTDB_SYSCONFIG=$OCF_RESKEY_ctdb_config_dir/ctdb
 elif [ -f "$OCF_RESKEY_ctdb_config_dir/ctdbd.conf" ]; then
 	CTDB_SYSCONFIG=$OCF_RESKEY_ctdb_config_dir/ctdbd.conf
 fi
 
 # Backup paths
 CTDB_SYSCONFIG_BACKUP=${CTDB_SYSCONFIG}.ctdb-ra-orig
 
 invoke_ctdb() {
 	# CTDB's defaults are:
 	local timeout
 	local timelimit
 	timeout=3
 	timelimit=120
 	# ...but we override with the timeout for the current op:
 	if [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
 		timeout=$((OCF_RESKEY_CRM_meta_timeout/1000))
 		timelimit=$((OCF_RESKEY_CRM_meta_timeout/1000))
 	fi
 	$OCF_RESKEY_ctdb_binary --socket="$OCF_RESKEY_ctdb_socket" \
 		-t $timeout -T $timelimit \
 		"$@"
 }
 
 # Enable any event scripts that are explicitly required.
 # Any others will ultimately be invoked or not based on how they ship
 # with CTDB, but will generally have no effect, beacuase the relevant
 # CTDB_MANAGES_* options won't be set in /etc/sysconfig/ctdb.
 enable_event_scripts() {
 	local event_dir
 	event_dir=$OCF_RESKEY_ctdb_config_dir/events.d
 
+	chmod u+x "$event_dir/00.ctdb"	# core database health check
+
 	if [ -f "${OCF_RESKEY_ctdb_config_dir}/public_addresses" ]; then
 		chmod u+x "$event_dir/10.interface"
 	else
 		chmod a-x "$event_dir/10.interface"
 	fi
 	if [ -f "${OCF_RESKEY_ctdb_config_dir}/static-routes" ]; then
 		chmod u+x "$event_dir/11.routing"
 	else
 		chmod a-x "$event_dir/11.routing"
 	fi
 	if ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" || \
 	   ocf_is_true "$OCF_RESKEY_ctdb_manages_winbind"; then
 		chmod u+x "$event_dir/50.samba"
 	else
 		chmod a-x "$event_dir/50.samba"
 	fi
 }
 
 # This function has no effect (currently no way to set CTDB_SET_*)
 # but remains here in case we need it in future.
 set_ctdb_variables() {
 	rv=$OCF_SUCCESS
 	set | grep ^CTDB_SET_ | cut -d_ -f3- |
 	while read v; do
 		varname=$(echo "$v" | cut -d= -f1)
 		value=$(echo "$v" | cut -d= -f2)
 		invoke_ctdb setvar "$varname" "$value" || rv=$OCF_ERR_GENERIC
 	done || rv=$OCF_ERR_GENERIC
 	return $rv
 }
 
 
 # Add necessary settings to /etc/samba/smb.conf.  In a perfect world,
 # we'd be able to generate a new, temporary, smb.conf file somewhere,
 # something like:
 #     include = /etc/samba/smb.conf
 #     [global]
 #       clustering = yes
 #       # ...etc...
 # Unfortunately, we can't do this, because there's no way to tell the
 # smb init script where the temporary config is, so we just edit
 # the default config file.
 init_smb_conf() {
 	# Don't screw around with the config if CTDB isn't managing Samba!
 	ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" || return 0
 
 	# replace these things in smb.conf
 	local repl
 	repl='# CTDB-RA:|passdb backend|clustering|idmap backend|idmap config[[:space:]]*\*[[:space:]]*:[[:space:]]*backend|private dir|ctdbd socket'
 
 	local private_dir
 	[ -n "$OCF_RESKEY_smb_private_dir" ] && private_dir="\tprivate dir = $OCF_RESKEY_smb_private_dir\n"
 
 	local vfs_fileid
 	local do_vfs
 	do_vfs=0
 	if  [ -n "$OCF_RESKEY_smb_fileid_algorithm" ]; then
 		repl="${repl}|fileid:algorithm|fileid:mapping"
 		vfs_fileid="\tfileid:algorithm = $OCF_RESKEY_smb_fileid_algorithm\n"
 		if sed -n '/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/p' $OCF_RESKEY_smb_conf | \
 		   grep -Eq '^[[:space:]]*vfs objects'; then
 			# vfs objects already specified, will append fileid to existing line
 			do_vfs=1
 		else
 			vfs_fileid="$vfs_fileid\tvfs objects = fileid\n"
 		fi
 	fi
 	# Preserve permissions of smb.conf
 	local idmap_config
 	if grep -Eqs '^[[:space:]]*idmap backend[[:space:]]*=' $OCF_RESKEY_smb_conf; then
 		idmap_config=old
 	else
 		idmap_config=new
 	fi
 	cp -a "$OCF_RESKEY_smb_conf" "$OCF_RESKEY_smb_conf.$$"
 	awk '
 		/^[[:space:]]*\[/ { global = 0 }
 		/^[[:space:]]*\[global\]/ { global = 1 }
 		{
 			if(global) {
 				if ('$do_vfs' && $0 ~ /^[[:space:]]vfs objects/ && $0 !~ /fileid/) {
 					print $0" fileid"
 				} else if ($0 !~ /^[[:space:]]*('"$repl"')/) {
 					print
 				}
 			} else {
 				print
 			}
 		}' "$OCF_RESKEY_smb_conf" | sed "/^[[:space:]]*\[global\]/ a\\
 \t# CTDB-RA: Begin auto-generated section (do not change below)\n\
 \tpassdb backend = $OCF_RESKEY_smb_passdb_backend\n\
 \tclustering = yes\n\
 \tctdbd socket = $OCF_RESKEY_ctdb_socket\n$private_dir$vfs_fileid\
 \t# CTDB-RA: End auto-generated section (do not change above)" > "$OCF_RESKEY_smb_conf.$$"
 	if [ "$idmap_config" = "old" ]; then
 		sed -i "/^[[:space:]]*clustering = yes/ a\\
 \tidmap backend = $OCF_RESKEY_smb_idmap_backend" $OCF_RESKEY_smb_conf.$$
 	else
 		sed -i "/^[[:space:]]*clustering = yes/ a\\
 \tidmap config * : backend = $OCF_RESKEY_smb_idmap_backend" $OCF_RESKEY_smb_conf.$$
 	fi
 	dd conv=notrunc,fsync of="$OCF_RESKEY_smb_conf.$$" if=/dev/null >/dev/null 2>&1
 	mv "$OCF_RESKEY_smb_conf.$$" "$OCF_RESKEY_smb_conf"
 }
 
 
 # Get rid of that section we added
 cleanup_smb_conf() {
 	ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" || return 0
 
 	# preserve permissions of smb.conf
 	cp -a "$OCF_RESKEY_smb_conf" "$OCF_RESKEY_smb_conf.$$"
 	sed '/# CTDB-RA: Begin/,/# CTDB-RA: End/d' "$OCF_RESKEY_smb_conf" > "$OCF_RESKEY_smb_conf.$$"
 	mv "$OCF_RESKEY_smb_conf.$$" "$OCF_RESKEY_smb_conf"
 }
 
 append_ctdb_sysconfig() {
 	[ -n "$2" ] && echo "$1=$2" >> "$CTDB_SYSCONFIG"
 }
 
 # Generate a new, minimal CTDB config file that's just enough
 # to get CTDB running as configured by the RA parameters.
 generate_ctdb_sysconfig() {
 	# Backup existing sysconfig if we're not already using an auto-generated one
 	grep -qa '# CTDB-RA: Auto-generated' $CTDB_SYSCONFIG || cp -p $CTDB_SYSCONFIG $CTDB_SYSCONFIG_BACKUP
 	if [ $? -ne 0 ]; then
 		ocf_log warn "Unable to backup $CTDB_SYSCONFIG to $CTDB_SYSCONFIG_BACKUP"
 	fi
 
 	ocf_log info "Generating new $CTDB_SYSCONFIG"
 
 	# Note to maintainers and other random hackers:
 	# Parameters may need to be set here, for CTDB event
 	# scripts to pick up, or may need to be passed to ctdbd
 	# when starting, or both.  Be careful.  The CTDB source
 	# tree and manpages are your friends.  As a concrete
 	# example, setting CTDB_START_AS_DISABLED here is
 	# completely useless, as this is actually a command line
 	# argument for ctdbd; it's not used anywhere else.
 
 	cat >$CTDB_SYSCONFIG <<EOF
 # CTDB-RA: Auto-generated by ${0}, backup is at $CTDB_SYSCONFIG_BACKUP
 CTDB_MONITOR_FREE_MEMORY=$OCF_RESKEY_ctdb_monitor_free_memory
 CTDB_SAMBA_SKIP_SHARE_CHECK=$(ocf_is_true "$OCF_RESKEY_ctdb_samba_skip_share_check" && echo 'yes' || echo 'no')
 CTDB_MANAGES_SAMBA=$(ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" && echo 'yes' || echo 'no')
 CTDB_MANAGES_WINBIND=$(ocf_is_true "$OCF_RESKEY_ctdb_manages_winbind" && echo 'yes' || echo 'no')
 EOF
 	append_ctdb_sysconfig CTDB_SERVICE_SMB $OCF_RESKEY_ctdb_service_smb
 	append_ctdb_sysconfig CTDB_SERVICE_NMB $OCF_RESKEY_ctdb_service_nmb
 	append_ctdb_sysconfig CTDB_SERVICE_WINBIND $OCF_RESKEY_ctdb_service_winbind
 }
 
 
 ctdb_usage() {
 	cat <<END
 usage: $0 {start|stop|monitor|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 
 ctdb_start() {
 	# Do nothing if already running
 	ctdb_monitor && return $OCF_SUCCESS
 
 	# Make sure config is adequate
 	ctdb_validate
 	rv=$?
 	[ $rv -ne 0 ] && return $rv
 
-	# Die if databases are corrupted
-	persistent_db_dir="${OCF_RESKEY_ctdb_dbdir}/persistent"
-	mkdir -p $persistent_db_dir 2>/dev/null
-	for pdbase in $persistent_db_dir/*.tdb.[0-9]; do
-		[ -f "$pdbase" ] || break
-		/usr/bin/tdbdump "$pdbase" >/dev/null 2>/dev/null || {
-			ocf_exit_reason "Persistent database $pdbase is corrupted!  CTDB will not start."
-			return $OCF_ERR_GENERIC
-		}
-	done
-
 	# Add necessary configuration to smb.conf
 	init_smb_conf
 	if [ $? -ne 0 ]; then
 		ocf_exit_reason "Failed to update $OCF_RESKEY_smb_conf."
 		return $OCF_ERR_GENERIC
 	fi
 
 	# Generate new CTDB sysconfig
 	generate_ctdb_sysconfig
 	enable_event_scripts
 
 	# Use logfile by default, or syslog if asked for
 	local log_option
 	# --logging supported from v4.3.0 and --logfile / --syslog support 
 	# has been removed from newer versions
 	version=$(ctdb version | awk '{print $NF}')
 	ocf_version_cmp "$version" "4.2.14"
 	if [ "$?" -eq "2" ]; then
 		log_option="--logging=file:$OCF_RESKEY_ctdb_logfile"
 		if [ "$OCF_RESKEY_ctdb_logfile" = "syslog" ]; then
 			log_option="--logging=syslog"
 		fi
 	else
 		log_option="--logfile=$OCF_RESKEY_ctdb_logfile"
 		if [ "$OCF_RESKEY_ctdb_logfile" = "syslog" ]; then
 			log_option="--syslog"
 		fi
 	fi
 	if [ ! -d "$(dirname $OCF_RESKEY_ctdb_logfile)" ]; then
 		# ensure the logfile's directory exists, otherwise ctdb will fail to start
 		mkdir -p $(dirname $OCF_RESKEY_ctdb_logfile)
 	fi
 
 	# ensure ctdb's rundir exists, otherwise it will fail to start
 	mkdir -p $OCF_RESKEY_ctdb_rundir 2>/dev/null
 
 	# public addresses file (should not be present, but need to set for correctness if it is)
 	local pub_addr_option
 	pub_addr_option=""
 	[ -f "${OCF_RESKEY_ctdb_config_dir}/public_addresses" ] && \
 		pub_addr_option="--public-addresses=${OCF_RESKEY_ctdb_config_dir}/public_addresses"
 	# start as disabled
 	local start_as_disabled
 	start_as_disabled="--start-as-disabled"
 	ocf_is_true "$OCF_RESKEY_ctdb_start_as_disabled" || start_as_disabled=""
 
 	# Start her up
 	"$OCF_RESKEY_ctdbd_binary" \
 		--reclock="$OCF_RESKEY_ctdb_recovery_lock" \
 		--nlist="$OCF_RESKEY_ctdb_config_dir/nodes" \
 		--socket="$OCF_RESKEY_ctdb_socket" \
 		--dbdir="$OCF_RESKEY_ctdb_dbdir" \
 		--dbdir-persistent="$OCF_RESKEY_ctdb_dbdir/persistent" \
 		--event-script-dir="$OCF_RESKEY_ctdb_config_dir/events.d" \
 		--notification-script="$OCF_RESKEY_ctdb_config_dir/notify.sh" \
 		--transport=tcp \
 		$start_as_disabled $log_option $pub_addr_option \
 		-d "$OCF_RESKEY_ctdb_debuglevel"
 	if [ $? -ne 0 ]; then
 		# cleanup smb.conf
 		cleanup_smb_conf
 
 		ocf_exit_reason "Failed to execute $OCF_RESKEY_ctdbd_binary."
 		return $OCF_ERR_GENERIC
 	else
 		# Wait a bit for CTDB to stabilize
 		# (until start times out if necessary)
 		while true; do
 			# Initial sleep is intentional (ctdb init script
 			# has sleep after ctdbd start, but before invoking
 			# ctdb to talk to it)
 			sleep 1
 			status=$(invoke_ctdb status 2>/dev/null)
 			if [ $? -ne 0 ]; then
 				# CTDB will be running, kill it before returning
 				ctdb_stop
 				ocf_exit_reason "Can't invoke $OCF_RESKEY_ctdb_binary --socket=$OCF_RESKEY_ctdb_socket status"
 				return $OCF_ERR_GENERIC
 			fi
 			if ! echo "$status" | grep -qs 'UNHEALTHY (THIS'; then
 				# Status does not say this node is unhealthy,
 				# so we're good to go.  Do a bit of final
 				# setup and (hopefully) return success.
 				set_ctdb_variables
 				return $?
 			fi
 		done
 	fi
 
 	# ctdbd will (or can) actually still be running at this point, so kill it
 	ctdb_stop
 
 	ocf_exit_reason "Timeout waiting for CTDB to stabilize"
 	return $OCF_ERR_GENERIC
 }
 
 
 ctdb_stop() {
 	# Do nothing if already stopped
 	pkill -0 -f "$OCF_RESKEY_ctdbd_binary" || return $OCF_SUCCESS
 
 	# Tell it to die nicely
 	invoke_ctdb shutdown >/dev/null 2>&1
 	rv=$?
 
 	# No more Mr. Nice Guy
 	count=0
 	while pkill -0 -f "$OCF_RESKEY_ctdbd_binary" ; do
 		sleep 1
 		count=$((count + 1))
 		[ $count -gt 10 ] && {
 			ocf_log info "killing ctdbd "
 			pkill -9 -f "$OCF_RESKEY_ctdbd_binary"
 			pkill -9 -f "${OCF_RESKEY_ctdb_config_dir}/events.d/"
 		}
 	done
 
 	# Cleanup smb.conf
 	cleanup_smb_conf
 
 	# It was a clean shutdown, return success
 	[ $rv -eq $OCF_SUCCESS ] && return $OCF_SUCCESS
 
 	# Unclean shutdown, return success if there's no ctdbds left (we
 	# killed them forcibly, but at least they're good and dead).
 	pkill -0 -f "$OCF_RESKEY_ctdbd_binary" || return $OCF_SUCCESS
 
 	# Problem: ctdb shutdown didn't work and neither did some vigorous
 	# kill -9ing.  Only thing to do is report failure.
 	return $OCF_ERR_GENERIC
 }
 
 
 ctdb_monitor() {
 	local status
 	# "ctdb status" exits non-zero if CTDB isn't running.
 	# It can also exit non-zero if there's a timeout (ctdbd blocked,
 	# stalled, massive load, or otherwise wedged).  If it's actually
 	# not running, STDERR will say "Errno:Connection refused(111)",
 	# whereas if it's wedged, it'll say various other unpleasant things.
 	status=$(invoke_ctdb status 2>&1)
 	if [ $? -ne 0 ]; then
 		if echo "$status" | grep -qs 'Connection refused'; then
 			return $OCF_NOT_RUNNING
 		elif echo "$status" | grep -qs 'No such file or directory'; then
 			return $OCF_NOT_RUNNING
 		elif echo $status | grep -qs 'connect() failed'; then
 			return $OCF_NOT_RUNNING
 		else
 			ocf_exit_reason "CTDB status call failed: $status"
 			return $OCF_ERR_GENERIC
 		fi
 	fi
 	if echo "$status" | grep -Eqs '(OK|DISABLED) \(THIS'; then
 		return $OCF_SUCCESS
 	fi
 
 	ocf_exit_reason "CTDB status is bad: $status"
 	return $OCF_ERR_GENERIC
 }
 
 
 ctdb_validate() {
-	# Required binaries (full path to tdbdump is intentional, as that's
-	# what's used in ctdb_start, which was lifted from the init script)
-	for binary in pkill /usr/bin/tdbdump; do
+	# Required binaries
+	for binary in pkill; do
 		check_binary $binary
 	done
 
 	if [ -z "$CTDB_SYSCONFIG" ]; then
 		ocf_exit_reason "Can't find CTDB config file (expecting /etc/sysconfig/ctdb, /etc/default/ctdb or similar)"
 		return $OCF_ERR_INSTALLED
 	fi
 
 	if ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" && [ ! -f "$OCF_RESKEY_smb_conf" ]; then
 		ocf_exit_reason "Samba config file '$OCF_RESKEY_smb_conf' does not exist."
 		return $OCF_ERR_INSTALLED
 	fi
 
 	if [ -f "${OCF_RESKEY_ctdb_config_dir}/public_addresses" ]; then
 		ocf_log warn "CTDB file '${OCF_RESKEY_ctdb_config_dir}/public_addresses' exists - CTDB will try to manage IP failover!"
 	fi
 
 	if [ ! -f "$OCF_RESKEY_ctdb_config_dir/nodes" ]; then
 		ocf_exit_reason "$OCF_RESKEY_ctdb_config_dir/nodes does not exist."
 		return $OCF_ERR_ARGS
 	fi
 
 	if [ -z "$OCF_RESKEY_ctdb_recovery_lock" ]; then
 		ocf_exit_reason "ctdb_recovery_lock not specified."
 		return $OCF_ERR_CONFIGURED
 	fi
 
-	lock_dir=$(dirname "$OCF_RESKEY_ctdb_recovery_lock")
-	touch "$lock_dir/$$" 2>/dev/null
-	if [ $? != 0 ]; then
-		ocf_exit_reason "Directory for lock file '$OCF_RESKEY_ctdb_recovery_lock' does not exist, or is not writable."
-		return $OCF_ERR_ARGS
+	if [ "${OCF_RESKEY_ctdb_recovery_lock:0:1}" == '!' ]; then
+		# '!' prefix means recovery lock is handled via a helper binary
+		binary="${OCF_RESKEY_ctdb_recovery_lock:1}"
+		binary="${binary%% *}"	# trim any parameters
+		if [ -z "$binary" ]; then
+			ocf_exit_reason "ctdb_recovery_lock invalid helper"
+			return $OCF_ERR_CONFIGURED
+		fi
+		check_binary "${binary}"
+	else
+		lock_dir=$(dirname "$OCF_RESKEY_ctdb_recovery_lock")
+		touch "$lock_dir/$$" 2>/dev/null
+		if [ $? != 0 ]; then
+			ocf_exit_reason "Directory for lock file '$OCF_RESKEY_ctdb_recovery_lock' does not exist, or is not writable."
+			return $OCF_ERR_ARGS
+		fi
+		rm "$lock_dir/$$"
 	fi
-	rm "$lock_dir/$$"
 
 	return $OCF_SUCCESS
 }
 
 
 case $__OCF_ACTION in
 meta-data)	meta_data
 		exit $OCF_SUCCESS
 		;;
 start)		ctdb_start;;
 stop)		ctdb_stop;;
 monitor)	ctdb_monitor;;
 validate-all)	ctdb_validate;;
 usage|help)	ctdb_usage
 		exit $OCF_SUCCESS
 		;;
 *)		ctdb_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 rc=$?
 ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
 exit $rc