aclocal.m4 config.h.in configure ldap/admin Makefile.am Makefile.in man/man1

[William Brown]

 Makefile.am                           |    3 
 Makefile.in                           |   74 +++++--
 aclocal.m4                            |  194 ++++++++++++-------
 config.h.in                           |    3 
 configure                             |  342 ++++++++++++++++------------------
 ldap/admin/src/scripts/readnsstate.in |  100 +++++++++
 man/man1/readnsstate.1                |   50 ++++
 7 files changed, 502 insertions(+), 264 deletions(-)

New commits:
commit f650df3e8a92d227dae87b7545fa2c78c60350d6
Author: William Brown <firstyear(a)redhat.com&gt;
Date:   Fri May 13 10:39:42 2016 +1000

    Ticket 48449 - Import readNSState from richm's repo
    
    Bug Description:  We reference readnsstate in a number of documents. We should
    include it in the repo
    
    Fix Description:  import and add readnsstate.py
    
    https://fedorahosted.org/389/ticket/48449
    
    Author: wibrown
    
    Review by: nhosoi, vashirov (Thanks!)

diff --git a/Makefile.am b/Makefile.am
index cad1b61..2468aa7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,7 @@ CLEANFILES =  dberrstrs.h ns-slapd.properties \
 	ldap/admin/src/scripts/schema-reload.pl ldap/admin/src/scripts/syntax-validate.pl \
 	ldap/admin/src/scripts/usn-tombstone-cleanup.pl ldap/admin/src/scripts/verify-db.pl \
 	ldap/admin/src/scripts/ds_selinux_port_query ldap/admin/src/scripts/ds_selinux_enabled
\
-	ldap/admin/src/scripts/dbverify \
+	ldap/admin/src/scripts/dbverify ldap/admin/src/scripts/readnsstate \
 	$(NULL)
 
 clean-local:
@@ -637,6 +637,7 @@ bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
 	ldap/admin/src/scripts/cl-dump.pl \
 	wrappers/repl-monitor \
 	ldap/admin/src/scripts/repl-monitor.pl \
+	ldap/admin/src/scripts/readnsstate \
 	ldap/admin/src/scripts/ds-logpipe.py
 
 # SCRIPTS makes them executables - these are perl modules
diff --git a/Makefile.in b/Makefile.in
index a45a0d6..200aed3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n
'$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -93,12 +103,6 @@ noinst_PROGRAMS = makstrdb$(EXEEXT)
 @SOLARIS_TRUE@am__append_2 = -lrt
 @SOLARIS_TRUE@am__append_3 = ldap/servers/slapd/tools/ldclt/opCheck.c
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/rpm/389-ds-base.spec.in \
-	depcomp $(dist_man_MANS) $(dist_noinst_DATA) \
-	$(dist_noinst_HEADERS) $(serverinc_HEADERS) README compile \
-	config.guess config.sub install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -113,6 +117,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/systemd.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(dist_noinst_DATA) \
+	$(dist_noinst_HEADERS) $(serverinc_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -1255,6 +1262,10 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/rpm/389-ds-base.spec.in \
+	README compile config.guess config.sub depcomp install-sh \
+	ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -1465,6 +1476,7 @@ program_transform_name = @program_transform_name@
 propertydir = $(datadir)@propertydir@
 psdir = @psdir@
 pythondir = $(libdir)@pythondir@
+pythonexec = @pythonexec@
 sampledatadir = $(datadir)@sampledatadir@
 sasl_inc = @sasl_inc@
 sasl_lib = @sasl_lib@
@@ -1523,6 +1535,8 @@ DS_DEFINES = -DBUILD_NUM=$(BUILDNUM)
-DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand
 @enable_nunc_stans_FALSE@NUNC_STANS_ON = 0
 @enable_nunc_stans_TRUE@NUNC_STANS_ON = 1
 DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include
-I. $(NUNC_STANS_INCLUDES)
+@enable_asan_FALSE@ASAN_ON = 0
+@enable_asan_TRUE@ASAN_ON = 1
 
 # these paths are dependent on the settings of prefix and exec_prefix which may be
specified
 # at make time.  So we cannot use AC_DEFINE in the configure.ac because that would set
the
@@ -1628,7 +1642,8 @@ CLEANFILES = dberrstrs.h ns-slapd.properties \
 	ldap/admin/src/scripts/ns-inactivate.pl ldap/admin/src/scripts/ns-newpwpolicy.pl \
 	ldap/admin/src/scripts/schema-reload.pl ldap/admin/src/scripts/syntax-validate.pl \
 	ldap/admin/src/scripts/usn-tombstone-cleanup.pl ldap/admin/src/scripts/verify-db.pl \
-	ldap/admin/src/scripts/dbverify \
+	ldap/admin/src/scripts/ds_selinux_port_query ldap/admin/src/scripts/ds_selinux_enabled
\
+	ldap/admin/src/scripts/dbverify ldap/admin/src/scripts/readnsstate \
 	$(NULL)
 
 taskdir = $(datadir)@scripttemplatedir@
@@ -2027,6 +2042,8 @@ sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \
 	ldap/admin/src/scripts/dbverify \
 	ldap/admin/src/scripts/upgradedb \
 	ldap/admin/src/scripts/dbmon.sh \
+	ldap/admin/src/scripts/ds_selinux_enabled \
+	ldap/admin/src/scripts/ds_selinux_port_query \
     wrappers/ldap-agent
 
 bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
@@ -2044,6 +2061,7 @@ bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
 	ldap/admin/src/scripts/cl-dump.pl \
 	wrappers/repl-monitor \
 	ldap/admin/src/scripts/repl-monitor.pl \
+	ldap/admin/src/scripts/readnsstate \
 	ldap/admin/src/scripts/ds-logpipe.py
 
 
@@ -3109,6 +3127,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK) $(LIBS
 @BUNDLE_FALSE@	-e 's,@enable_autobind\@,$(enable_autobind),g' \
 @BUNDLE_FALSE@	-e 's,@enable_auto_dn_suffix\@,$(enable_auto_dn_suffix),g' \
 @BUNDLE_FALSE@	-e 's,@enable_presence\@,$(enable_presence),g' \
+@BUNDLE_FALSE@	-e 's,@enable_asan\@,$(ASAN_ON),g' \
 @BUNDLE_FALSE@	-e 's,@ECHO_N\@,$(ECHO_N),g' \
 @BUNDLE_FALSE@	-e 's,@ECHO_C\@,$(ECHO_C),g' \
 @BUNDLE_FALSE@	-e 's,@brand\@,$(brand),g' \
@@ -3127,6 +3146,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK) $(LIBS
 @BUNDLE_FALSE@	-e 's,@with_selinux\@,@with_selinux@,g' \
 @BUNDLE_FALSE@	-e 's,@with_tmpfiles_d\@,@with_tmpfiles_d@,g' \
 @BUNDLE_FALSE@	-e 's,@perlexec\@,@perlexec@,g' \
+@BUNDLE_FALSE@	-e 's,@pythonexec\@,@pythonexec@,g' \
 @BUNDLE_FALSE@	-e 's,@sttyexec\@,@sttyexec@,g' \
 @BUNDLE_FALSE@	-e 's,@initconfigdir\@,$(initconfigdir),g' \
 @BUNDLE_FALSE@	-e 's,@updatedir\@,$(updatedir),g' \
@@ -3186,6 +3206,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK) $(LIBS
 @BUNDLE_TRUE@	-e 's,@enable_autobind\@,$(enable_autobind),g' \
 @BUNDLE_TRUE@	-e 's,@enable_auto_dn_suffix\@,$(enable_auto_dn_suffix),g' \
 @BUNDLE_TRUE@	-e 's,@enable_presence\@,$(enable_presence),g' \
+@BUNDLE_TRUE@	-e 's,@enable_asan\@,$(ASAN_ON),g' \
 @BUNDLE_TRUE@	-e 's,@ECHO_N\@,$(ECHO_N),g' \
 @BUNDLE_TRUE@	-e 's,@ECHO_C\@,$(ECHO_C),g' \
 @BUNDLE_TRUE@	-e 's,@brand\@,$(brand),g' \
@@ -3204,6 +3225,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK) $(LIBS
 @BUNDLE_TRUE@	-e 's,@with_selinux\@,@with_selinux@,g' \
 @BUNDLE_TRUE@	-e 's,@with_tmpfiles_d\@,@with_tmpfiles_d@,g' \
 @BUNDLE_TRUE@	-e 's,@perlexec\@,@perlexec@,g' \
+@BUNDLE_TRUE@	-e 's,@pythonexec\@,@pythonexec@,g' \
 @BUNDLE_TRUE@	-e 's,@sttyexec\@,@sttyexec@,g' \
 @BUNDLE_TRUE@	-e 's,@initconfigdir\@,$(initconfigdir),g'\
 @BUNDLE_TRUE@	-e 's,@updatedir\@,$(updatedir),g' \
@@ -3233,7 +3255,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am 
$(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -3254,8 +3275,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -10352,10 +10373,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -10390,16 +10417,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -10727,6 +10755,8 @@ uninstall-man: uninstall-man1 uninstall-man8
 	uninstall-systemdsystemunitDATA uninstall-taskSCRIPTS \
 	uninstall-updateDATA uninstall-updateSCRIPTS
 
+.PRECIOUS: Makefile
+
 
 clean-local:
 	-rm -rf dist
@@ -10775,9 +10805,13 @@ ns-slapd.properties: makstrdb
 	$(fixupcmd) $^ > $@
 
 # yes, that is an @ in the filename . . .
-%/$(PACKAGE_NAME)@.service: %/systemd.template.service.in
-	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
-	$(fixupcmd) $^ > $@
+@enable_asan_TRUE@%/$(PACKAGE_NAME)@.service: %/systemd.template.asan.service.in
+@enable_asan_TRUE@	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+@enable_asan_TRUE@	$(fixupcmd) $^ > $@
+# yes, that is an @ in the filename . . .
+@enable_asan_FALSE@%/$(PACKAGE_NAME)@.service: %/systemd.template.service.in
+@enable_asan_FALSE@	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+@enable_asan_FALSE@	$(fixupcmd) $^ > $@
 
 %/$(PACKAGE_NAME).systemd: %/systemd.template.sysconfig
 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
@@ -10822,7 +10856,7 @@ rpmbrprep: dist-bzip2 rpmroot
 	cp $(distdir).tar.bz2 $(RPMBUILD)/SOURCES
 	cp $(srcdir)/rpm/389-ds-base-git.sh $(RPMBUILD)/SOURCES
 	cp $(srcdir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES
-	sed -e "s/__VERSION__/$(RPM_VERSION)/" -e
"s/__RELEASE__/$(RPM_RELEASE)/" -e
"s/__NUNC_STANS_ON__/$(NUNC_STANS_ON)/" <
$(abs_builddir)/rpm/389-ds-base.spec > $(RPMBUILD)/SPECS/389-ds-base.spec
+	sed -e "s/__VERSION__/$(RPM_VERSION)/" -e
"s/__RELEASE__/$(RPM_RELEASE)/" -e
"s/__NUNC_STANS_ON__/$(NUNC_STANS_ON)/" -e "s/__ASAN_ON__/$(ASAN_ON)/"
 < $(abs_builddir)/rpm/389-ds-base.spec > $(RPMBUILD)/SPECS/389-ds-base.spec
 
 # Requires rpmdevtools. Consider making this a dependancy of rpms.
 rpmsources: rpmbrprep
diff --git a/aclocal.m4 b/aclocal.m4
index 58e04a0..8d926b8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not
guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically
'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically
'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.4], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.4])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # Figure out how to run the assembler.                      -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -78,7 +78,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -123,15 +123,14 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_COND_IF                                            -*- Autoconf -*-
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -168,7 +167,7 @@ fi[]dnl
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -199,7 +198,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -390,7 +389,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -466,7 +465,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -475,6 +474,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -550,8 +555,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -583,6 +588,51 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake(a)gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>;.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -591,7 +641,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -613,7 +662,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -624,7 +673,7 @@ echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -634,7 +683,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -656,7 +705,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -691,7 +740,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of
Makefiles])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -739,41 +788,9 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -812,7 +829,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -841,7 +858,54 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -860,7 +924,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -941,7 +1005,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1001,7 +1065,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1029,7 +1093,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1048,7 +1112,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/config.h.in b/config.h.in
index ea9369b..1b549f7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -357,9 +357,6 @@
 /* no getdomainname */
 #undef NO_DOMAINNAME
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* OS version */
 #undef OSVERSION
 
diff --git a/configure b/configure
index 7dc8c3e..3f26631 100755
--- a/configure
+++ b/configure
@@ -715,6 +715,7 @@ HPUX_FALSE
 HPUX_TRUE
 initconfigdir
 sttyexec
+pythonexec
 perlexec
 initdir
 LIBCRUN
@@ -771,6 +772,8 @@ BUNDLE_TRUE
 gccsec_defs
 RPM_HARDEND_CC_FALSE
 RPM_HARDEND_CC_TRUE
+enable_asan_FALSE
+enable_asan_TRUE
 asan_defs
 debug_defs
 LIBOBJS
@@ -935,7 +938,7 @@ with_fhs
 with_fhs_opt
 with_tmpfiles_d
 with_perldir
-with_pythondir
+with_pythonexec
 with_instconfigdir
 with_initddir
 with_nspr
@@ -1667,7 +1670,7 @@ Optional Packages:
 
   --with-perldir=PATH     Directory for perl)
 
-  --with-pythondir=PATH   Directory for python)
+  --with-pythonexec=PATH  Path to executable for python)
 
   --with-instconfigdir=/path
                           Base directory for instance specific writable
@@ -2802,7 +2805,7 @@ cat >>confdefs.h <<_ACEOF
 #define DS_PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-am__api_version='1.13'
+am__api_version='1.15'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3003,8 +3006,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed
"$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -3023,7 +3026,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing"
>&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3342,8 +3345,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -3444,6 +3447,48 @@ $as_echo "$am_cv_prog_tar_pax" >&6; }
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake(a)gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>;.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry."
"$LINENO" 5
+  fi
+fi
+
 # define these for automake distdir
 VERSION=$PACKAGE_VERSION
 PACKAGE=$PACKAGE_TARNAME
@@ -4793,6 +4838,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext
>&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
>&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
>&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o
together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... "
>&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext"
>&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o"
>&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
>&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc"
>&5
@@ -4921,131 +5025,6 @@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c
and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... "
>&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o
together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6;
}
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 # By default we simply use the C compiler to build assembly code.
 
@@ -17694,7 +17673,7 @@ if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  debug_defs="-g3 -DDEBUG -DMCC_DEBUG"
+  debug_defs="-g3 -DDEBUG -DMCC_DEBUG -O0"
 
 else
 
@@ -17724,6 +17703,14 @@ $as_echo "no" >&6; }
 fi
 
 
+ if test "$enable_asan" = "yes"; then
+  enable_asan_TRUE=
+  enable_asan_FALSE='#'
+else
+  enable_asan_TRUE='#'
+  enable_asan_FALSE=
+fi
+
 
  if test -f /usr/lib/rpm/redhat/redhat-hardened-cc1; then
   RPM_HARDEND_CC_TRUE=
@@ -18275,25 +18262,25 @@ else
   with_perldir=
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pythondir"
>&5
-$as_echo_n "checking for --with-pythondir... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pythonexec"
>&5
+$as_echo_n "checking for --with-pythonexec... " >&6; }
 
-# Check whether --with-pythondir was given.
-if test "${with_pythondir+set}" = set; then :
-  withval=$with_pythondir;
+# Check whether --with-pythonexec was given.
+if test "${with_pythonexec+set}" = set; then :
+  withval=$with_pythonexec;
 fi
 
-if test -n "$with_pythondir"; then
-  if test  "$with_pythondir" = yes ; then
-    as_fn_error $? "You must specify --with-pythondir=/full/path/to/python"
"$LINENO" 5
-  elif test  "$with_pythondir" = no ; then
-    with_pythondir=
+if test -n "$with_pythonexec"; then
+  if test  "$with_pythonexec" = yes ; then
+    as_fn_error $? "You must specify --with-pythonexec=/full/path/to/python"
"$LINENO" 5
+  elif test  "$with_pythonexec" = no ; then
+    with_pythonexec=/usr/bin/python2
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pythondir"
>&5
-$as_echo "$with_pythondir" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pythonexec"
>&5
+$as_echo "$with_pythonexec" >&6; }
   fi
 else
-  with_pythondir=
+  with_pythonexec=/usr/bin/python2
 fi
 
 
@@ -18391,6 +18378,14 @@ if test -n "$with_perldir"; then
 else
   perlexec='/usr/bin/env perl'
 fi
+
+# This will let us change over the python version easier in the future.
+if test -n "$with_pythonexec"; then
+  pythonexec="$with_pythonexec"
+else
+  pythonexec='/usr/bin/env python2'
+fi
+
 # we use stty in perl scripts to disable password echo
 # this doesn't work unless the full absolute path of the
 # stty command is used e.g. system("stty -echo") does not
@@ -18663,6 +18658,7 @@ fi
 
 
 
+
 # set default initconfigdir if not already set
 # value will be set so as to be relative to $(sysconfdir)
 if test -z "$initconfigdir" ; then
@@ -21259,24 +21255,18 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Systemd with
pkg-config" >&5
 $as_echo_n "checking for Systemd with pkg-config... " >&6; }
-    if test "$with_journald" = yes; then
 
-        if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists systemd
libsystemd-journal libsystemd-daemon ; then
-            systemd_inc=`$PKG_CONFIG --cflags-only-I systemd libsystemd-journal
libsystemd-daemon`
-            systemd_lib=`$PKG_CONFIG --libs-only-l systemd libsystemd-journal
libsystemd-daemon`
-            systemd_defs="-DWITH_SYSTEMD -DHAVE_JOURNALD"
-        else
-            as_fn_error $? "no Systemd / Journald pkg-config files"
"$LINENO" 5
-        fi
+    if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd ; then
+        systemd_inc=`$PKG_CONFIG --cflags-only-I libsystemd`
+        systemd_lib=`$PKG_CONFIG --libs-only-l libsystemd`
     else
+        as_fn_error $? "no Systemd pkg-config files" "$LINENO" 5
+    fi
 
-        if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists systemd
libsystemd-daemon ; then
-            systemd_inc=`$PKG_CONFIG --cflags-only-I systemd libsystemd-daemon`
-            systemd_lib=`$PKG_CONFIG --libs-only-l systemd libsystemd-daemon`
-            systemd_defs="-DWITH_SYSTEMD"
-        else
-            as_fn_error $? "no Systemd pkg-config files" "$LINENO" 5
-        fi
+    if test "$with_journald" = yes; then
+        systemd_defs="-DWITH_SYSTEMD -DHAVE_JOURNALD"
+    else
+        systemd_defs="-DWITH_SYSTEMD"
     fi
 
     # Check for the pkg config provided unit paths
@@ -21333,11 +21323,10 @@ $as_echo "$with_systemdsystemconfdir" >&6; }
     fi
 
 
-    if test -n "$with_systemdsystemunitdir" -o -n
"$with_systemdsystemconfdir" ; then
-       if test -z "$with_systemdgroupname" ; then
-          with_systemdgroupname=$PACKAGE_NAME.target
-       fi
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
--with-systemdgroupname" >&5
+    if test -z "$with_systemdgroupname" ; then
+       with_systemdgroupname=$PACKAGE_NAME.target
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
--with-systemdgroupname" >&5
 $as_echo_n "checking for --with-systemdgroupname... " >&6; }
 
 # Check whether --with-systemdgroupname was given.
@@ -21345,18 +21334,17 @@ if test "${with_systemdgroupname+set}" = set; then :
   withval=$with_systemdgroupname;
 fi
 
-       if test "$with_systemdgroupname" = yes ; then
-          as_fn_error $? "You must specify
--with-systemdgroupname=name.of.group" "$LINENO" 5
-       elif test "$with_systemdgroupname" = no ; then
-          as_fn_error $? "You must specify
--with-systemdgroupname=name.of.group" "$LINENO" 5
-       else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$with_systemdgroupname" >&5
+    if test "$with_systemdgroupname" = yes ; then
+       as_fn_error $? "You must specify --with-systemdgroupname=name.of.group"
"$LINENO" 5
+    elif test "$with_systemdgroupname" = no ; then
+       as_fn_error $? "You must specify --with-systemdgroupname=name.of.group"
"$LINENO" 5
+    else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_systemdgroupname"
>&5
 $as_echo "$with_systemdgroupname" >&6; }
-       fi
-
     fi
 
 
+
 fi
 # End of with_systemd
 
@@ -21653,6 +21641,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z
"${am__fastdepCCAS_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${enable_asan_TRUE}" && test -z
"${enable_asan_FALSE}"; then
+  as_fn_error $? "conditional \"enable_asan\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${RPM_HARDEND_CC_TRUE}" && test -z
"${RPM_HARDEND_CC_FALSE}"; then
   as_fn_error $? "conditional \"RPM_HARDEND_CC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/ldap/admin/src/scripts/readnsstate.in
b/ldap/admin/src/scripts/readnsstate.in
new file mode 100644
index 0000000..2b3c464
--- /dev/null
+++ b/ldap/admin/src/scripts/readnsstate.in
@@ -0,0 +1,100 @@
+#!@pythonexec@
+
+import sys
+from struct import pack, unpack, calcsize
+import base64
+import time
+from datetime import timedelta
+
+def flipend(end):
+    if end == '<':
+        return '>'
+    if end == '>':
+        return '<'
+
+def printGenState(dn, nsstate, flip):
+    if pack('<h', 1) == pack('=h',1):
+        print("Little Endian")
+        end = '<'
+        if flip:
+            end = flipend(end)
+    elif pack('>h', 1) == pack('=h',1):
+        print("Big Endian")
+        end = '>'
+        if flip:
+            end = flipend(end)
+    else:
+        print("Unknown Endian")
+        sys.exit(-1) # blow up
+    print("For replica", dn)
+    thelen = len(nsstate)
+    if thelen <= 20:
+        pad = 2 # padding for short H values
+        timefmt = 'I' # timevals are unsigned 32-bit int
+    else:
+        pad = 6 # padding for short H values
+        timefmt = 'Q' # timevals are unsigned 64-bit int
+
+    base_fmtstr = "H%dx3%sH%dx" % (pad, timefmt, pad)
+    print("  fmtstr=[%s]" % base_fmtstr)
+    print("  size=%d" % calcsize(base_fmtstr))
+    print("  len of nsstate is", thelen)
+    fmtstr = end + base_fmtstr
+    (rid, sampled_time, local_offset, remote_offset, seq_num) = unpack(fmtstr, nsstate)
+    now = int(time.time())
+    tdiff = now-sampled_time
+    wrongendian = False
+    try:
+        tdelta = timedelta(seconds=tdiff)
+        wrongendian = tdelta.days > 10*365
+    except OverflowError: # int overflow
+        wrongendian = True
+    # if the sampled time is more than 20 years off, this is
+    # probably the wrong endianness
+    if wrongendian:
+        print("The difference in days is", tdiff/86400)
+        print("This is probably the wrong bit-endianness - flipping")
+        end = flipend(end)
+        fmtstr = end + base_fmtstr
+        (rid, sampled_time, local_offset, remote_offset, seq_num) = unpack(fmtstr,
nsstate)
+        tdiff = now-sampled_time
+        tdelta = timedelta(seconds=tdiff)
+    print("""  CSN generator state:
+    Replica ID    : %d
+    Sampled Time  : %d
+    Gen as csn    : %08x%04d%04d0000
+    Time as str   : %s
+    Local Offset  : %d
+    Remote Offset : %d
+    Seq. num      : %d
+    System time   : %s
+    Diff in sec.  : %d
+    Day:sec diff  : %d:%d
+""" % (rid, sampled_time, sampled_time, seq_num, rid,
time.ctime(sampled_time), local_offset,
+       remote_offset, seq_num, time.ctime(now), tdiff, tdelta.days, tdelta.seconds))
+
+def main():
+    dn = ''
+    nsstate = ''
+    if len(sys.argv) < 2:
+        print("Usage: readnsstate.py /path/to/dse.ldif")
+        sys.exit(1)
+    if len(sys.argv) > 2:
+        flip = True
+    else:
+        flip = False
+    for line in open(sys.argv[1]):
+        if line.startswith("dn: "):
+            dn = line[4:].strip()
+        if line.lower().startswith("nsstate:: ") and
dn.startswith("cn=replica"):
+            b64val = line[10:].strip()
+            print("nsState is", b64val)
+            nsstate = base64.decodestring(b64val.encode())
+            printGenState(dn, nsstate, flip)
+    if not nsstate:
+        print("Error: nsstate not found in file for cn=replica", sys.argv[1])
+        sys.exit(1)
+
+if __name__ == '__main__':
+    main()
+
diff --git a/man/man1/readnsstate.1 b/man/man1/readnsstate.1
new file mode 100644
index 0000000..0edf352
--- /dev/null
+++ b/man/man1/readnsstate.1
@@ -0,0 +1,50 @@
+.TH READNSSTATE 1 "May 13 2016"
+.SH NAME
+readnsstate \- interpret the contents of cn=replica's nsState value
+.B readnsstate
+/etc/dirsrv/slapd-INSTANCE/dse.ldif
+.PP
+.SH DESCRIPTION
+Decode and display the content of the nsState attribute from a directory servers
cn=replicate object.
+.PP
+.SH EXAMPLES
+.PP
+.nf
+.RS
+sudo /usr/bin/readnsstate /etc/dirsrv/slapd-localhost/dse.ldif
+.RE
+.fi
+.PP
+.nf
+.RS
+For replica cn=replica,cn=dc\3Dexample\2Cdc\3Dcom,cn=mapping tree,cn=config
+  fmtstr=[H6x3QH6x]
+  size=40
+  len of nsstate is 40
+  CSN generator state:
+    Replica ID    : 5
+    Sampled Time  : 1463100468
+    Gen as csn    : 57352434000000050000
+    Time as str   : Fri May 13 10:47:48 2016
+    Local Offset  : 0
+    Remote Offset : 276
+    Seq. num      : 0
+    System time   : Fri May 13 14:01:25 2016
+    Diff in sec.  : 11617
+    Day:sec diff  : 0:11617
+.RE
+.fi
+.PP
+.SH AUTHOR
+readnsstate was written by the 389 Project by richm.
+.SH "REPORTING BUGS"
+Report bugs to https://fedorahosted.org/389/newticket.
+.SH COPYRIGHT
+Copyright \(co 2016 Red Hat, Inc.
+.br
+This manual page was written by William Brown <wibrown(a)redhat.com&gt;,
+for the 389 Directory Server Project.
+.br
+This is free software.  You may redistribute copies of it under the terms of
+the Directory Server license found in the LICENSE file of this
+software distribution.