Merge ~ahasenack/ubuntu/+source/cifs-utils:eoan-cifs-6.9 into ubuntu/+source/cifs-utils:debian/sid

[Andreas Hasenack]

PPA with test packages: sudo add-apt-repository ppa:ahasenack/cifs-utils-6.9 -y -u

https://launchpad.net/~ahasenack/+archive/ubuntu/cifs-utils-6.9

Update to version 6.9, going ahead of debian because of their freeze. No packaging changes required, so should be easy to sync again later.

There is a new binary shipped with 6.9: smbinfo. apt-file search finds no such binary in the (eoan) archive, so it should be fine.

I ran the samba dep8 tests, which include an authenticated and anonymous cifs test, and they passed with cifs-utils 6.9:
(...)
autopkgtest [11:08:42]: test smbclient-share-access: - - - - - - - - - - results - - - - - - - - - -
smbclient-share-access PASS
autopkgtest [11:08:43]: @@@@@@@@@@@@@@@@@@@@ summary
cifs-share-access PASS
python-smoke PASS
smbclient-anonymous-share-list PASS
smbclient-authenticated-share-list PASS
smbclient-share-access PASS
qemu-system-x86_64: terminating on signal 15 from pid 7724 (/usr/bin/python3)

real 6m6,081s

Unmerged commits

205849d... by Andreas Hasenack on 2019-06-17

update-metadata

7a8168f... by Andreas Hasenack on 2019-06-17

changelog

b6acefe... by Andreas Hasenack on 2019-06-17

  * New upstream version: 6.9 (LP: #1831292)

diff --git a/AUTHORS b/AUTHORS
index 081c2fe..e03f097 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,8 +3,9 @@ Steve French <[e-mail]>
 Igor Mammedov <[e-mail]>
 Shirish Pargaonkar <[e-mail]>
 Suresh Jayaraman <[e-mail]>
-Pavel Shilovsky <[e-mail]>
+Pavel Shilovsky <[e-mail]>
 Igor Druzhinin <[e-mail]>
 Scott Lovenberg <[e-mail]>
+Aurelien Aptel <[e-mail]>
 
 ...and others.
diff --git a/Makefile.am b/Makefile.am
index 30658e3..8291b99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ man_MANS=
 
 SUFFIXES = .rst .1 .8
 
-RST2MAN = rst2man --syntax-highlight=none $< $@
+RST2MAN = $(have_rst2man) --syntax-highlight=none $< $@
 
 .rst.1:
 	$(RST2MAN)
@@ -79,6 +79,12 @@ setcifsacl.rst: setcifsacl.rst.in
 	$(SED) 's,[@]pluginpath@,$(pluginpath),' $(srcdir)/$@.in > $@-t && mv $@-t $@
 endif
 
+if CONFIG_SMBINFO
+bin_PROGRAMS += smbinfo
+smbinfo_SOURCES = smbinfo.c
+rst_man_pages += smbinfo.1
+endif
+
 if CONFIG_PLUGIN
 plugindir = $(pkglibdir)
 plugin_PROGRAMS = idmapwb.so
diff --git a/Makefile.in b/Makefile.in
index a1fca18..1978cf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,8 +90,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 root_sbin_PROGRAMS = mount.cifs$(EXEEXT)
-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-sbin_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+sbin_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5)
 @CONFIG_CIFSUPCALL_TRUE@am__append_1 = cifs.upcall
 @CONFIG_CIFSUPCALL_TRUE@am__append_2 = cifs.upcall.8
 @CONFIG_CIFSCREDS_TRUE@am__append_3 = cifscreds
@@ -102,13 +102,15 @@ sbin_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
 @CONFIG_CIFSACL_TRUE@am__append_8 = getcifsacl setcifsacl
 @CONFIG_CIFSACL_TRUE@am__append_9 = getcifsacl.1 setcifsacl.1
 @CONFIG_CIFSACL_TRUE@am__append_10 = getcifsacl.rst setcifsacl.rst
+@CONFIG_SMBINFO_TRUE@am__append_11 = smbinfo
+@CONFIG_SMBINFO_TRUE@am__append_12 = smbinfo.1
 @CONFIG_PLUGIN_TRUE@plugin_PROGRAMS = idmapwb.so$(EXEEXT)
-@CONFIG_PLUGIN_TRUE@am__append_11 = idmapwb.8
-@CONFIG_PLUGIN_TRUE@am__append_12 = idmapwb.rst
+@CONFIG_PLUGIN_TRUE@am__append_13 = idmapwb.8
+@CONFIG_PLUGIN_TRUE@am__append_14 = idmapwb.rst
 @CONFIG_PAM_TRUE@pam_PROGRAMS = pam_cifscreds.so$(EXEEXT)
-@CONFIG_PAM_TRUE@am__append_13 = pam_cifscreds.8
-@CONFIG_MAN_TRUE@am__append_14 = $(rst_man_pages)
-@CONFIG_MAN_TRUE@am__append_15 = $(rst_man_pages)
+@CONFIG_PAM_TRUE@am__append_15 = pam_cifscreds.8
+@CONFIG_MAN_TRUE@am__append_16 = $(rst_man_pages)
+@CONFIG_MAN_TRUE@am__append_17 = $(rst_man_pages)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/idmap.m4 \
@@ -126,12 +128,13 @@ CONFIG_CLEAN_VPATH_FILES =
 @CONFIG_CIFSCREDS_TRUE@am__EXEEXT_1 = cifscreds$(EXEEXT)
 @CONFIG_CIFSACL_TRUE@am__EXEEXT_2 = getcifsacl$(EXEEXT) \
 @CONFIG_CIFSACL_TRUE@	setcifsacl$(EXEEXT)
+@CONFIG_SMBINFO_TRUE@am__EXEEXT_3 = smbinfo$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pamdir)" \
 	"$(DESTDIR)$(plugindir)" "$(DESTDIR)$(root_sbindir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)"
-@CONFIG_CIFSUPCALL_TRUE@am__EXEEXT_3 = cifs.upcall$(EXEEXT)
-@CONFIG_CIFSIDMAP_TRUE@am__EXEEXT_4 = cifs.idmap$(EXEEXT)
+@CONFIG_CIFSUPCALL_TRUE@am__EXEEXT_4 = cifs.upcall$(EXEEXT)
+@CONFIG_CIFSIDMAP_TRUE@am__EXEEXT_5 = cifs.idmap$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(pam_PROGRAMS) $(plugin_PROGRAMS) \
 	$(root_sbin_PROGRAMS) $(sbin_PROGRAMS)
 am__cifs_idmap_SOURCES_DIST = cifs.idmap.c idmap_plugin.c
@@ -176,6 +179,10 @@ am__setcifsacl_SOURCES_DIST = setcifsacl.c idmap_plugin.c
 @CONFIG_CIFSACL_TRUE@	idmap_plugin.$(OBJEXT)
 setcifsacl_OBJECTS = $(am_setcifsacl_OBJECTS)
 setcifsacl_DEPENDENCIES =
+am__smbinfo_SOURCES_DIST = smbinfo.c
+@CONFIG_SMBINFO_TRUE@am_smbinfo_OBJECTS = smbinfo.$(OBJEXT)
+smbinfo_OBJECTS = $(am_smbinfo_OBJECTS)
+smbinfo_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -206,11 +213,13 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(cifs_idmap_SOURCES) $(cifs_upcall_SOURCES) \
 	$(cifscreds_SOURCES) $(getcifsacl_SOURCES) idmapwb.c \
-	$(mount_cifs_SOURCES) pam_cifscreds.c $(setcifsacl_SOURCES)
+	$(mount_cifs_SOURCES) pam_cifscreds.c $(setcifsacl_SOURCES) \
+	$(smbinfo_SOURCES)
 DIST_SOURCES = $(am__cifs_idmap_SOURCES_DIST) \
 	$(am__cifs_upcall_SOURCES_DIST) $(am__cifscreds_SOURCES_DIST) \
 	$(am__getcifsacl_SOURCES_DIST) idmapwb.c $(mount_cifs_SOURCES) \
-	pam_cifscreds.c $(am__setcifsacl_SOURCES_DIST)
+	pam_cifscreds.c $(am__setcifsacl_SOURCES_DIST) \
+	$(am__smbinfo_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -449,17 +458,17 @@ mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c
 mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD)
 include_HEADERS = cifsidmap.h
 rst_man_pages = mount.cifs.8 $(am__append_2) $(am__append_4) \
-	$(am__append_6) $(am__append_9) $(am__append_11) \
-	$(am__append_13)
+	$(am__append_6) $(am__append_9) $(am__append_12) \
+	$(am__append_13) $(am__append_15)
 
 #
 # Generate man pages troff source from POD format
 #
-man_MANS = $(am__append_14)
+man_MANS = $(am__append_16)
 SUFFIXES = .rst .1 .8
-RST2MAN = rst2man --syntax-highlight=none $< $@
-CLEANFILES = $(am__append_7) $(am__append_10) $(am__append_12) \
-	$(am__append_15)
+RST2MAN = $(have_rst2man) --syntax-highlight=none $< $@
+CLEANFILES = $(am__append_7) $(am__append_10) $(am__append_14) \
+	$(am__append_17)
 @CONFIG_CIFSUPCALL_TRUE@cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c
 @CONFIG_CIFSUPCALL_TRUE@cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) $(CAPNG_LDADD)
 @CONFIG_CIFSCREDS_TRUE@cifscreds_SOURCES = cifscreds.c cifskey.c resolve_host.c util.c
@@ -470,6 +479,7 @@ CLEANFILES = $(am__append_7) $(am__append_10) $(am__append_12) \
 @CONFIG_CIFSACL_TRUE@getcifsacl_LDADD = -ldl
 @CONFIG_CIFSACL_TRUE@setcifsacl_SOURCES = setcifsacl.c idmap_plugin.c
 @CONFIG_CIFSACL_TRUE@setcifsacl_LDADD = -ldl
+@CONFIG_SMBINFO_TRUE@smbinfo_SOURCES = smbinfo.c
 @CONFIG_PLUGIN_TRUE@plugindir = $(pkglibdir)
 SUBDIRS = contrib
 all: config.h
@@ -768,6 +778,10 @@ setcifsacl$(EXEEXT): $(setcifsacl_OBJECTS) $(setcifsacl_DEPENDENCIES) $(EXTRA_se
 	@rm -f setcifsacl$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(setcifsacl_OBJECTS) $(setcifsacl_LDADD) $(LIBS)
 
+smbinfo$(EXEEXT): $(smbinfo_OBJECTS) $(smbinfo_DEPENDENCIES) $(EXTRA_smbinfo_DEPENDENCIES) 
+	@rm -f smbinfo$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(smbinfo_OBJECTS) $(smbinfo_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -788,6 +802,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_cifscreds.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve_host.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setcifsacl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smbinfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spnego.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
 
diff --git a/README b/README
index 3e311a5..76e864f 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ separate package.
     Home page: http://wiki.samba.org/index.php/LinuxCIFS_utils
     Mailing list: [e-mail]
     Git Repository: git://git.samba.org/cifs-utils.git
-    Maintainer: Jeffrey Layton <[e-mail]>
+    Maintainer: Pavel Shilovsky <[e-mail]>
 
 1. COMPILING
 
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index ca8f33a..dd6704e 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.8.
+@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.9.
 @%:@
 @%:@ Report bugs to <[e-mail]>.
 @%:@ 
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cifs-utils'
 PACKAGE_TARNAME='cifs-utils'
-PACKAGE_VERSION='6.8'
-PACKAGE_STRING='cifs-utils 6.8'
+PACKAGE_VERSION='6.9'
+PACKAGE_STRING='cifs-utils 6.9'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils'
 
@@ -630,6 +630,8 @@ CONFIG_PLUGIN_FALSE
 CONFIG_PLUGIN_TRUE
 CONFIG_PAM_FALSE
 CONFIG_PAM_TRUE
+CONFIG_SMBINFO_FALSE
+CONFIG_SMBINFO_TRUE
 CONFIG_CIFSACL_FALSE
 CONFIG_CIFSACL_TRUE
 CONFIG_CIFSIDMAP_FALSE
@@ -759,6 +761,7 @@ enable_cifsupcall
 enable_cifscreds
 enable_cifsidmap
 enable_cifsacl
+enable_smbinfo
 enable_pam
 enable_systemd
 enable_man
@@ -1332,7 +1335,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cifs-utils 6.8 to adapt to many kinds of systems.
+\`configure' configures cifs-utils 6.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1403,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cifs-utils 6.8:";;
+     short | recursive ) echo "Configuration of cifs-utils 6.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,6 +1423,7 @@ Optional Features:
   --enable-cifscreds      Create cifscreds utility @<:@default=yes@:>@
   --enable-cifsidmap      Create cifs.idmap binary @<:@default=yes@:>@
   --enable-cifsacl        Create get/set cifsacl binary @<:@default=yes@:>@
+  --enable-smbinfo        Create smbinfo binary @<:@default=yes@@
   --enable-pam            Create cifscreds PAM module @<:@default=yes@:>@
   --enable-systemd        Enable systemd specific behavior for mount.cifs
                           @<:@default=yes@:>@
@@ -1529,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cifs-utils configure 6.8
+cifs-utils configure 6.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +2002,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cifs-utils $as_me 6.8, which was
+It was created by cifs-utils $as_me 6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2868,7 +2872,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cifs-utils'
- VERSION='6.8'
+ VERSION='6.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3011,6 +3015,14 @@ else
 fi
 
 
+@%:@ Check whether --enable-smbinfo was given.
+if test "${enable_smbinfo+set}" = set; then :
+  enableval=$enable_smbinfo; enable_smbinfo=$enableval
+else
+  enable_smbinfo="maybe"
+fi
+
+
 @%:@ Check whether --enable-pam was given.
 if test "${enable_pam+set}" = set; then :
   enableval=$enable_pam; enable_pam=$enableval
@@ -6002,8 +6014,10 @@ fi
 
 # if docs are not disabled, check if rst2man is available
 if test $enable_man != "no"; then
-	# Extract the first word of "rst2man", so it can be a program name with args.
-set dummy rst2man; ac_word=$2
+	for ac_prog in rst2man-3.6 rst2man-3.4 rst2man-3 rst2man.py rst2man
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_have_rst2man+:} false; then :
@@ -6019,7 +6033,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_have_rst2man="yes"
+    ac_cv_prog_have_rst2man="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6027,7 +6041,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_have_rst2man" && ac_cv_prog_have_rst2man="no"
 fi
 fi
 have_rst2man=$ac_cv_prog_have_rst2man
@@ -6040,12 +6053,16 @@ $as_echo "no" >&6; }
 fi
 
 
+  test -n "$have_rst2man" && break
+done
+test -n "$have_rst2man" || have_rst2man="no"
+
 	if test $have_rst2man = "no"; then
 		if test $enable_man = "yes"; then
-			as_fn_error $? "rst2man not found: cannot generate man pages, consider installing perl." "$LINENO" 5
+			as_fn_error $? "rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils." "$LINENO" 5
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation." >&5
-$as_echo "$as_me: WARNING: rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation." >&2;}
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation." >&5
+$as_echo "$as_me: WARNING: rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation." >&2;}
 			enable_man="no"
 		fi
 	else
@@ -6109,6 +6126,14 @@ else
   CONFIG_CIFSACL_FALSE=
 fi
 
+ if test "$enable_smbinfo" != "no"; then
+  CONFIG_SMBINFO_TRUE=
+  CONFIG_SMBINFO_FALSE='#'
+else
+  CONFIG_SMBINFO_TRUE='#'
+  CONFIG_SMBINFO_FALSE=
+fi
+
  if test "$enable_pam" != "no"; then
   CONFIG_PAM_TRUE=
   CONFIG_PAM_FALSE='#'
@@ -6379,6 +6404,10 @@ if test -z "${CONFIG_CIFSACL_TRUE}" && test -z "${CONFIG_CIFSACL_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_CIFSACL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_SMBINFO_TRUE}" && test -z "${CONFIG_SMBINFO_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_SMBINFO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_PAM_TRUE}" && test -z "${CONFIG_PAM_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6784,7 +6813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cifs-utils $as_me 6.8, which was
+This file was extended by cifs-utils $as_me 6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6851,7 +6880,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cifs-utils config.status 6.8
+cifs-utils config.status 6.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index ca8f33a..dd6704e 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.8.
+@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.9.
 @%:@
 @%:@ Report bugs to <[e-mail]>.
 @%:@ 
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cifs-utils'
 PACKAGE_TARNAME='cifs-utils'
-PACKAGE_VERSION='6.8'
-PACKAGE_STRING='cifs-utils 6.8'
+PACKAGE_VERSION='6.9'
+PACKAGE_STRING='cifs-utils 6.9'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils'
 
@@ -630,6 +630,8 @@ CONFIG_PLUGIN_FALSE
 CONFIG_PLUGIN_TRUE
 CONFIG_PAM_FALSE
 CONFIG_PAM_TRUE
+CONFIG_SMBINFO_FALSE
+CONFIG_SMBINFO_TRUE
 CONFIG_CIFSACL_FALSE
 CONFIG_CIFSACL_TRUE
 CONFIG_CIFSIDMAP_FALSE
@@ -759,6 +761,7 @@ enable_cifsupcall
 enable_cifscreds
 enable_cifsidmap
 enable_cifsacl
+enable_smbinfo
 enable_pam
 enable_systemd
 enable_man
@@ -1332,7 +1335,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cifs-utils 6.8 to adapt to many kinds of systems.
+\`configure' configures cifs-utils 6.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1403,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cifs-utils 6.8:";;
+     short | recursive ) echo "Configuration of cifs-utils 6.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,6 +1423,7 @@ Optional Features:
   --enable-cifscreds      Create cifscreds utility @<:@default=yes@:>@
   --enable-cifsidmap      Create cifs.idmap binary @<:@default=yes@:>@
   --enable-cifsacl        Create get/set cifsacl binary @<:@default=yes@:>@
+  --enable-smbinfo        Create smbinfo binary @<:@default=yes@@
   --enable-pam            Create cifscreds PAM module @<:@default=yes@:>@
   --enable-systemd        Enable systemd specific behavior for mount.cifs
                           @<:@default=yes@:>@
@@ -1529,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cifs-utils configure 6.8
+cifs-utils configure 6.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +2002,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cifs-utils $as_me 6.8, which was
+It was created by cifs-utils $as_me 6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2868,7 +2872,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cifs-utils'
- VERSION='6.8'
+ VERSION='6.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3011,6 +3015,14 @@ else
 fi
 
 
+@%:@ Check whether --enable-smbinfo was given.
+if test "${enable_smbinfo+set}" = set; then :
+  enableval=$enable_smbinfo; enable_smbinfo=$enableval
+else
+  enable_smbinfo="maybe"
+fi
+
+
 @%:@ Check whether --enable-pam was given.
 if test "${enable_pam+set}" = set; then :
   enableval=$enable_pam; enable_pam=$enableval
@@ -6002,8 +6014,10 @@ fi
 
 # if docs are not disabled, check if rst2man is available
 if test $enable_man != "no"; then
-	# Extract the first word of "rst2man", so it can be a program name with args.
-set dummy rst2man; ac_word=$2
+	for ac_prog in rst2man-3.6 rst2man-3.4 rst2man-3 rst2man.py rst2man
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_have_rst2man+:} false; then :
@@ -6019,7 +6033,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_have_rst2man="yes"
+    ac_cv_prog_have_rst2man="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6027,7 +6041,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_have_rst2man" && ac_cv_prog_have_rst2man="no"
 fi
 fi
 have_rst2man=$ac_cv_prog_have_rst2man
@@ -6040,12 +6053,16 @@ $as_echo "no" >&6; }
 fi
 
 
+  test -n "$have_rst2man" && break
+done
+test -n "$have_rst2man" || have_rst2man="no"
+
 	if test $have_rst2man = "no"; then
 		if test $enable_man = "yes"; then
-			as_fn_error $? "rst2man not found: cannot generate man pages, consider installing perl." "$LINENO" 5
+			as_fn_error $? "rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils." "$LINENO" 5
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation." >&5
-$as_echo "$as_me: WARNING: rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation." >&2;}
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation." >&5
+$as_echo "$as_me: WARNING: rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation." >&2;}
 			enable_man="no"
 		fi
 	else
@@ -6109,6 +6126,14 @@ else
   CONFIG_CIFSACL_FALSE=
 fi
 
+ if test "$enable_smbinfo" != "no"; then
+  CONFIG_SMBINFO_TRUE=
+  CONFIG_SMBINFO_FALSE='#'
+else
+  CONFIG_SMBINFO_TRUE='#'
+  CONFIG_SMBINFO_FALSE=
+fi
+
  if test "$enable_pam" != "no"; then
   CONFIG_PAM_TRUE=
   CONFIG_PAM_FALSE='#'
@@ -6379,6 +6404,10 @@ if test -z "${CONFIG_CIFSACL_TRUE}" && test -z "${CONFIG_CIFSACL_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_CIFSACL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_SMBINFO_TRUE}" && test -z "${CONFIG_SMBINFO_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_SMBINFO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_PAM_TRUE}" && test -z "${CONFIG_PAM_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6784,7 +6813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cifs-utils $as_me 6.8, which was
+This file was extended by cifs-utils $as_me 6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6851,7 +6880,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cifs-utils config.status 6.8
+cifs-utils config.status 6.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 4bd072a..2f0f550 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -37,58 +37,58 @@
                         'configure.ac'
                       ],
                       {
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'PKG_CHECK_MODULES_STATIC' => 1,
-                        '_AM_IF_OPTION' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'm4_pattern_forbid' => 1,
                         '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_LIBCAP' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
                         'AC_TEST_WBCHL' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AU_DEFUN' => 1,
                         '_AM_SET_OPTIONS' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'PKG_CHECK_MODULES_STATIC' => 1,
+                        'm4_include' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'include' => 1,
                         'AM_SET_DEPDIR' => 1,
-                        'AC_TEST_WBC_IDMAP_BOTH' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_LIBCAP' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        '_AM_DEPENDENCIES' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        '_AM_SET_OPTION' => 1,
                         'AC_DEFUN' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
+                        'PKG_CHECK_MODULES' => 1,
                         'AM_PROG_INSTALL_STRIP' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'PKG_INSTALLDIR' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        '_m4_warn' => 1,
                         'AM_MISSING_PROG' => 1,
-                        'm4_include' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        'include' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
                         'm4_pattern_allow' => 1,
-                        '_m4_warn' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AC_DEFUN_ONCE' => 1
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_TEST_WBC_IDMAP_BOTH' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -103,66 +103,66 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LIBSOURCE' => 1,
+                        'AM_NLS' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_INIT' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        'include' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        '_AM_COND_IF' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
+                        'sinclude' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
                         '_m4_warn' => 1,
-                        'm4_pattern_allow' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
                         'AM_MAINTAINER_MODE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AM_PROG_AR' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PROG_MOC' => 1,
+                        '_AM_COND_IF' => 1,
                         'm4_sinclude' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_PROG_CC_C_O' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'AC_INIT' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_NLS' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'm4_include' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
-                        'sinclude' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'include' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'm4_pattern_forbid' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AM_PROG_MOC' => 1,
                         'LT_INIT' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AH_OUTPUT' => 1,
                         'AM_PROG_LIBTOOL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_FC_FREEFORM' => 1
+                        'AM_GNU_GETTEXT' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index db1c432..9b82273 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -1102,115 +1102,115 @@ m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([AM_DEFAULT_V])
 m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
 m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_BACKSLASH$])
 m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^IDMAP_PLUGIN_PATH$])
-m4trace:configure.ac:64: -1- m4_pattern_allow([^pluginpath$])
-m4trace:configure.ac:66: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.ac:68: -1- m4_pattern_allow([^IDMAP_PLUGIN_PATH$])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^pluginpath$])
+m4trace:configure.ac:71: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1492: AC_ARG_WITH is expanded from...
-configure.ac:66: the top level])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^pamdir$])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^ROOTSBINDIR$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:81: -1- _AM_PROG_CC_C_O
-m4trace:configure.ac:81: -1- AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext])
-m4trace:configure.ac:81: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:81: -1- AM_SET_DEPDIR
-m4trace:configure.ac:81: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:81: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:81: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:81: -1- AM_DEP_TRACK
-m4trace:configure.ac:81: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:81: -1- AM_CONDITIONAL([am__fastdepCC], [
+configure.ac:71: the top level])
+m4trace:configure.ac:75: -1- m4_pattern_allow([^pamdir$])
+m4trace:configure.ac:83: -1- m4_pattern_allow([^ROOTSBINDIR$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:86: -1- _AM_PROG_CC_C_O
+m4trace:configure.ac:86: -1- AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext])
+m4trace:configure.ac:86: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:86: -1- AM_SET_DEPDIR
+m4trace:configure.ac:86: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:86: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:86: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:86: -1- AM_DEP_TRACK
+m4trace:configure.ac:86: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__nodep$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([am__nodep])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:86: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_POSIX_SOURCE$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_MINIX$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^__EXTENSIONS__$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_ALL_SOURCE$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_GNU_SOURCE$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
-m4trace:configure.ac:83: -1- AM_PROG_CC_C_O
-m4trace:configure.ac:87: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:92: -1- m4_pattern_allow([^HAVE__BOOL$])
-m4trace:configure.ac:92: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
-m4trace:configure.ac:93: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:93: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^off_t$])
-m4trace:configure.ac:95: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:96: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_PTRDIFF_T$])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_SSIZE_T$])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_UINT32_T$])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_UINT8_T$])
-m4trace:configure.ac:100: -1- m4_pattern_allow([^HAVE_GETMNTENT$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^malloc$])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^realloc$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^RT_LDADD$])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
-m4trace:configure.ac:132: -1- m4_pattern_allow([^PIE_CFLAGS$])
-m4trace:configure.ac:139: -1- m4_pattern_allow([^RELRO_CFLAGS$])
-m4trace:configure.ac:166: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
-m4trace:configure.ac:171: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
-m4trace:configure.ac:181: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
-m4trace:configure.ac:200: -1- m4_pattern_allow([^KRB5_LDADD$])
-m4trace:configure.ac:204: -1- AC_TEST_WBCHL
-m4trace:configure.ac:204: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_POSIX_SOURCE$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_MINIX$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_ALL_SOURCE$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_GNU_SOURCE$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
+m4trace:configure.ac:88: -1- AM_PROG_CC_C_O
+m4trace:configure.ac:92: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE__BOOL$])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^off_t$])
+m4trace:configure.ac:100: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_PTRDIFF_T$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_SSIZE_T$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_UINT32_T$])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_UINT8_T$])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_GETMNTENT$])
+m4trace:configure.ac:106: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
+m4trace:configure.ac:106: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^malloc$])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^realloc$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^RT_LDADD$])
+m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
+m4trace:configure.ac:137: -1- m4_pattern_allow([^PIE_CFLAGS$])
+m4trace:configure.ac:144: -1- m4_pattern_allow([^RELRO_CFLAGS$])
+m4trace:configure.ac:171: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
+m4trace:configure.ac:176: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
+m4trace:configure.ac:186: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+m4trace:configure.ac:205: -1- m4_pattern_allow([^KRB5_LDADD$])
+m4trace:configure.ac:209: -1- AC_TEST_WBCHL
+m4trace:configure.ac:209: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [
 				if test "$enable_cifsidmap" = "yes"; then
 					AC_MSG_ERROR([wbclient.h not found, consider installing libwbclient-devel.])
 				else
@@ -1224,76 +1224,81 @@ m4trace:configure.ac:204: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [
 					enable_cifsacl="no"
 				fi
 			])
-m4trace:configure.ac:204: -1- PKG_PROG_PKG_CONFIG
-m4trace:configure.ac:204: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
-m4trace:configure.ac:204: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_CFLAGS=`$PKG_CONFIG --[]cflags "wbclient" 2>/dev/null`
+m4trace:configure.ac:209: -1- PKG_PROG_PKG_CONFIG
+m4trace:configure.ac:209: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
+m4trace:configure.ac:209: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_CFLAGS=`$PKG_CONFIG --[]cflags "wbclient" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:204: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_LIBS=`$PKG_CONFIG --[]libs "wbclient" 2>/dev/null`
+m4trace:configure.ac:209: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_LIBS=`$PKG_CONFIG --[]libs "wbclient" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
-m4trace:configure.ac:204: -1- _PKG_SHORT_ERRORS_SUPPORTED
-m4trace:configure.ac:204: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
-m4trace:configure.ac:207: -1- AC_TEST_WBC_IDMAP_BOTH
-m4trace:configure.ac:207: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
-m4trace:configure.ac:210: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$])
-m4trace:configure.ac:240: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
-m4trace:configure.ac:250: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
-m4trace:configure.ac:255: -1- m4_pattern_allow([^have_rst2man$])
-m4trace:configure.ac:269: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
-m4trace:configure.ac:273: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"])
-m4trace:configure.ac:273: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$])
-m4trace:configure.ac:273: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$])
-m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE])
-m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE])
-m4trace:configure.ac:274: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
-m4trace:configure.ac:274: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
-m4trace:configure.ac:274: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
-m4trace:configure.ac:274: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
-m4trace:configure.ac:274: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
-m4trace:configure.ac:275: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
-m4trace:configure.ac:275: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
-m4trace:configure.ac:275: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
-m4trace:configure.ac:275: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
-m4trace:configure.ac:275: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
-m4trace:configure.ac:276: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
-m4trace:configure.ac:276: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
-m4trace:configure.ac:276: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
-m4trace:configure.ac:276: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
-m4trace:configure.ac:276: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
-m4trace:configure.ac:277: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
-m4trace:configure.ac:277: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
-m4trace:configure.ac:277: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
-m4trace:configure.ac:277: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
-m4trace:configure.ac:277: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
-m4trace:configure.ac:278: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"])
-m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$])
-m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$])
-m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE])
-m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE])
-m4trace:configure.ac:279: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
-m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
-m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
-m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
-m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
-m4trace:configure.ac:284: -1- AC_LIBCAP
-m4trace:configure.ac:284: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
-m4trace:configure.ac:284: -1- m4_pattern_allow([^HAVE_LIBCAP$])
-m4trace:configure.ac:284: -1- m4_pattern_allow([^LIBCAP$])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:286: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:286: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:286: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:209: -1- _PKG_SHORT_ERRORS_SUPPORTED
+m4trace:configure.ac:209: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
+m4trace:configure.ac:212: -1- AC_TEST_WBC_IDMAP_BOTH
+m4trace:configure.ac:212: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
+m4trace:configure.ac:215: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+m4trace:configure.ac:228: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$])
+m4trace:configure.ac:245: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
+m4trace:configure.ac:255: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
+m4trace:configure.ac:260: -1- m4_pattern_allow([^have_rst2man$])
+m4trace:configure.ac:274: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
+m4trace:configure.ac:278: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE])
+m4trace:configure.ac:279: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
+m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
+m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
+m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
+m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
+m4trace:configure.ac:280: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
+m4trace:configure.ac:280: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
+m4trace:configure.ac:280: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
+m4trace:configure.ac:280: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
+m4trace:configure.ac:280: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
+m4trace:configure.ac:281: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
+m4trace:configure.ac:281: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
+m4trace:configure.ac:281: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
+m4trace:configure.ac:281: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
+m4trace:configure.ac:281: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
+m4trace:configure.ac:282: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
+m4trace:configure.ac:282: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
+m4trace:configure.ac:282: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
+m4trace:configure.ac:282: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
+m4trace:configure.ac:282: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
+m4trace:configure.ac:283: -1- AM_CONDITIONAL([CONFIG_SMBINFO], [test "$enable_smbinfo" != "no"])
+m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_SMBINFO_TRUE$])
+m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_SMBINFO_FALSE$])
+m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_TRUE])
+m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_FALSE])
+m4trace:configure.ac:284: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"])
+m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$])
+m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$])
+m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE])
+m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE])
+m4trace:configure.ac:285: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
+m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
+m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
+m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
+m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
+m4trace:configure.ac:290: -1- AC_LIBCAP
+m4trace:configure.ac:290: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^HAVE_LIBCAP$])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^LIBCAP$])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:292: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:292: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:292: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:292: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:292: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index 803b429..3603fda 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -1,6 +1,6 @@
 m4trace:aclocal.m4:1429: -1- m4_include([aclocal/idmap.m4])
 m4trace:aclocal.m4:1430: -1- m4_include([aclocal/libcap.m4])
-m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [6.8], [[e-mail]], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
+m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [6.9], [[e-mail]], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
 m4trace:configure.ac:4: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:4: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:4: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -253,152 +253,152 @@ m4trace:configure.ac:10: -1- AC_SUBST([AM_BACKSLASH])
 m4trace:configure.ac:10: -1- AC_SUBST_TRACE([AM_BACKSLASH])
 m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_BACKSLASH$])
 m4trace:configure.ac:10: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
-m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([IDMAP_PLUGIN_PATH])
-m4trace:configure.ac:63: -1- m4_pattern_allow([^IDMAP_PLUGIN_PATH$])
-m4trace:configure.ac:63: -1- AH_OUTPUT([IDMAP_PLUGIN_PATH], [/* Location of plugin that ID mapping infrastructure should use. (usually a
+m4trace:configure.ac:68: -1- AC_DEFINE_TRACE_LITERAL([IDMAP_PLUGIN_PATH])
+m4trace:configure.ac:68: -1- m4_pattern_allow([^IDMAP_PLUGIN_PATH$])
+m4trace:configure.ac:68: -1- AH_OUTPUT([IDMAP_PLUGIN_PATH], [/* Location of plugin that ID mapping infrastructure should use. (usually a
    symlink to real plugin) */
 @%:@undef IDMAP_PLUGIN_PATH])
-m4trace:configure.ac:64: -1- AC_SUBST([pluginpath])
-m4trace:configure.ac:64: -1- AC_SUBST_TRACE([pluginpath])
-m4trace:configure.ac:64: -1- m4_pattern_allow([^pluginpath$])
-m4trace:configure.ac:66: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
+m4trace:configure.ac:69: -1- AC_SUBST([pluginpath])
+m4trace:configure.ac:69: -1- AC_SUBST_TRACE([pluginpath])
+m4trace:configure.ac:69: -1- m4_pattern_allow([^pluginpath$])
+m4trace:configure.ac:71: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:207: AC_HELP_STRING is expanded from...
 ../../lib/autoconf/general.m4:1492: AC_ARG_WITH is expanded from...
-configure.ac:66: the top level])
-m4trace:configure.ac:70: -1- AC_SUBST([pamdir])
-m4trace:configure.ac:70: -1- AC_SUBST_TRACE([pamdir])
-m4trace:configure.ac:70: -1- m4_pattern_allow([^pamdir$])
-m4trace:configure.ac:78: -1- AC_SUBST([ROOTSBINDIR])
-m4trace:configure.ac:78: -1- AC_SUBST_TRACE([ROOTSBINDIR])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^ROOTSBINDIR$])
-m4trace:configure.ac:81: -1- AC_SUBST([CC])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:81: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:81: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:81: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:81: -1- AC_SUBST([CC])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- AC_SUBST([CC])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- AC_SUBST([CC])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- AC_SUBST([CC])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:81: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([ac_ct_CC])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:81: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([EXEEXT])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:81: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([OBJEXT])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:81: -1- AC_REQUIRE_AUX_FILE([compile])
-m4trace:configure.ac:81: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([DEPDIR])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:81: -1- AC_SUBST([am__include])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([am__include])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:81: -1- AC_SUBST([am__quote])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([am__quote])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:81: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:81: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:81: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:81: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:81: -1- AC_SUBST([am__nodep])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([am__nodep])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__nodep$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([am__nodep])
-m4trace:configure.ac:81: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([CCDEPMODE])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:81: -1- AM_CONDITIONAL([am__fastdepCC], [
+configure.ac:71: the top level])
+m4trace:configure.ac:75: -1- AC_SUBST([pamdir])
+m4trace:configure.ac:75: -1- AC_SUBST_TRACE([pamdir])
+m4trace:configure.ac:75: -1- m4_pattern_allow([^pamdir$])
+m4trace:configure.ac:83: -1- AC_SUBST([ROOTSBINDIR])
+m4trace:configure.ac:83: -1- AC_SUBST_TRACE([ROOTSBINDIR])
+m4trace:configure.ac:83: -1- m4_pattern_allow([^ROOTSBINDIR$])
+m4trace:configure.ac:86: -1- AC_SUBST([CC])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:86: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:86: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:86: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:86: -1- AC_SUBST([CC])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- AC_SUBST([CC])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- AC_SUBST([CC])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- AC_SUBST([CC])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:86: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:86: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([EXEEXT])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:86: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:86: -1- AC_REQUIRE_AUX_FILE([compile])
+m4trace:configure.ac:86: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:86: -1- AC_SUBST([am__include])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:86: -1- AC_SUBST([am__quote])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([am__quote])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:86: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:86: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([AMDEP_TRUE])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:86: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([AMDEP_FALSE])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:86: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:86: -1- AC_SUBST([am__nodep])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([am__nodep])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__nodep$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([am__nodep])
+m4trace:configure.ac:86: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([CCDEPMODE])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:86: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:81: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:81: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.ac:81: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-m4trace:configure.ac:81: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:81: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:82: -1- AC_SUBST([CPP])
-m4trace:configure.ac:82: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:82: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:82: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:82: -1- AC_SUBST([CPP])
-m4trace:configure.ac:82: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:82: -1- AC_SUBST([GREP])
-m4trace:configure.ac:82: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:82: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:82: -1- AC_SUBST_TRACE([EGREP])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:82: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:86: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:86: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.ac:86: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:86: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:87: -1- AC_SUBST([CPP])
+m4trace:configure.ac:87: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:87: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:87: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:87: -1- AC_SUBST([CPP])
+m4trace:configure.ac:87: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:87: -1- AC_SUBST([GREP])
+m4trace:configure.ac:87: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:87: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:87: -1- AC_SUBST_TRACE([EGREP])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:87: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
 @%:@undef STDC_HEADERS])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
 @%:@undef HAVE_SYS_STAT_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
 @%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
 @%:@undef HAVE_STRING_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
 @%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
 @%:@undef HAVE_STRINGS_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_SOURCE])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_POSIX_SOURCE$])
-m4trace:configure.ac:82: -1- AH_OUTPUT([_POSIX_SOURCE], [/* Define to 1 if you need to in order for `stat\' and other things to work. */
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_SOURCE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_POSIX_SOURCE$])
+m4trace:configure.ac:87: -1- AH_OUTPUT([_POSIX_SOURCE], [/* Define to 1 if you need to in order for `stat\' and other things to work. */
 @%:@undef _POSIX_SOURCE])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_1_SOURCE])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
-m4trace:configure.ac:82: -1- AH_OUTPUT([_POSIX_1_SOURCE], [/* Define to 2 if the system does not provide POSIX.1 features except with
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_1_SOURCE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
+m4trace:configure.ac:87: -1- AH_OUTPUT([_POSIX_1_SOURCE], [/* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */
 @%:@undef _POSIX_1_SOURCE])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_MINIX])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_MINIX$])
-m4trace:configure.ac:82: -1- AH_OUTPUT([_MINIX], [/* Define to 1 if on MINIX. */
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_MINIX])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_MINIX$])
+m4trace:configure.ac:87: -1- AH_OUTPUT([_MINIX], [/* Define to 1 if on MINIX. */
 @%:@undef _MINIX])
-m4trace:configure.ac:82: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX 3, Interix.  */
+m4trace:configure.ac:87: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
@@ -419,439 +419,448 @@ m4trace:configure.ac:82: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable exten
 # undef __EXTENSIONS__
 #endif
 ])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^__EXTENSIONS__$])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_ALL_SOURCE$])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_GNU_SOURCE$])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_PTHREAD_SEMANTICS])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
-m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
-m4trace:configure.ac:83: -1- AM_PROG_CC_C_O
-m4trace:configure.ac:87: -1- AC_SUBST([SED])
-m4trace:configure.ac:87: -1- AC_SUBST_TRACE([SED])
-m4trace:configure.ac:87: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE__BOOL])
-m4trace:configure.ac:92: -1- m4_pattern_allow([^HAVE__BOOL$])
-m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE__BOOL], [/* Define to 1 if the system has the type `_Bool\'. */
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_ALL_SOURCE$])
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_GNU_SOURCE$])
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_PTHREAD_SEMANTICS])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
+m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
+m4trace:configure.ac:87: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
+m4trace:configure.ac:88: -1- AM_PROG_CC_C_O
+m4trace:configure.ac:92: -1- AC_SUBST([SED])
+m4trace:configure.ac:92: -1- AC_SUBST_TRACE([SED])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE__BOOL])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE__BOOL$])
+m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE__BOOL], [/* Define to 1 if the system has the type `_Bool\'. */
 @%:@undef HAVE__BOOL])
-m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDBOOL_H])
-m4trace:configure.ac:92: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
-m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if stdbool.h conforms to C99. */
+m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDBOOL_H])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
+m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if stdbool.h conforms to C99. */
 @%:@undef HAVE_STDBOOL_H])
-m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
-m4trace:configure.ac:93: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:93: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:98: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef uid_t])
-m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
-m4trace:configure.ac:93: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:93: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
+m4trace:configure.ac:98: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:98: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef gid_t])
-m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([off_t])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^off_t$])
-m4trace:configure.ac:94: -1- AH_OUTPUT([off_t], [/* Define to `long int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([off_t])
+m4trace:configure.ac:99: -1- m4_pattern_allow([^off_t$])
+m4trace:configure.ac:99: -1- AH_OUTPUT([off_t], [/* Define to `long int\' if <sys/types.h> does not define. */
 @%:@undef off_t])
-m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
-m4trace:configure.ac:95: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:95: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
+m4trace:configure.ac:100: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:100: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef pid_t])
-m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:96: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:96: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([size_t])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:101: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
 @%:@undef size_t])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTRDIFF_T])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_PTRDIFF_T$])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_PTRDIFF_T], [/* Define to 1 if the system has the type `ptrdiff_t\'. */
+m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTRDIFF_T])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_PTRDIFF_T$])
+m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_PTRDIFF_T], [/* Define to 1 if the system has the type `ptrdiff_t\'. */
 @%:@undef HAVE_PTRDIFF_T])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSIZE_T])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_SSIZE_T$])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_SSIZE_T], [/* Define to 1 if the system has the type `ssize_t\'. */
+m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSIZE_T])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_SSIZE_T$])
+m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_SSIZE_T], [/* Define to 1 if the system has the type `ssize_t\'. */
 @%:@undef HAVE_SSIZE_T])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT32_T])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_UINT32_T$])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_UINT32_T], [/* Define to 1 if the system has the type `uint32_t\'. */
+m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT32_T])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_UINT32_T$])
+m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_UINT32_T], [/* Define to 1 if the system has the type `uint32_t\'. */
 @%:@undef HAVE_UINT32_T])
-m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT8_T])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_UINT8_T$])
-m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_UINT8_T], [/* Define to 1 if the system has the type `uint8_t\'. */
+m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT8_T])
+m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_UINT8_T$])
+m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_UINT8_T], [/* Define to 1 if the system has the type `uint8_t\'. */
 @%:@undef HAVE_UINT8_T])
-m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETMNTENT])
-m4trace:configure.ac:100: -1- m4_pattern_allow([^HAVE_GETMNTENT$])
-m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
+m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETMNTENT])
+m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_GETMNTENT$])
+m4trace:configure.ac:105: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
 @%:@undef HAVE_GETMNTENT])
-m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([LSTAT_FOLLOWS_SLASHED_SYMLINK])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
-m4trace:configure.ac:101: -1- AH_OUTPUT([LSTAT_FOLLOWS_SLASHED_SYMLINK], [/* Define to 1 if `lstat\' dereferences a symlink specified with a trailing
+m4trace:configure.ac:106: -1- AC_DEFINE_TRACE_LITERAL([LSTAT_FOLLOWS_SLASHED_SYMLINK])
+m4trace:configure.ac:106: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
+m4trace:configure.ac:106: -1- AH_OUTPUT([LSTAT_FOLLOWS_SLASHED_SYMLINK], [/* Define to 1 if `lstat\' dereferences a symlink specified with a trailing
    slash. */
 @%:@undef LSTAT_FOLLOWS_SLASHED_SYMLINK])
-m4trace:configure.ac:101: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS lstat.$ac_objext"])
-m4trace:configure.ac:101: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:101: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:101: -1- AC_LIBSOURCE([lstat.c])
-m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:106: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS lstat.$ac_objext"])
+m4trace:configure.ac:106: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:106: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:106: -1- AC_LIBSOURCE([lstat.c])
+m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
 @%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
-m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if your system has a GNU libc compatible `malloc\' function, and
+m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if your system has a GNU libc compatible `malloc\' function, and
    to 0 otherwise. */
 @%:@undef HAVE_MALLOC])
-m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:102: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS malloc.$ac_objext"])
-m4trace:configure.ac:102: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:102: -1- AC_LIBSOURCE([malloc.c])
-m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([malloc])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^malloc$])
-m4trace:configure.ac:102: -1- AH_OUTPUT([malloc], [/* Define to rpl_malloc if the replacement function should be used. */
+m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:107: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS malloc.$ac_objext"])
+m4trace:configure.ac:107: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:107: -1- AC_LIBSOURCE([malloc.c])
+m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([malloc])
+m4trace:configure.ac:107: -1- m4_pattern_allow([^malloc$])
+m4trace:configure.ac:107: -1- AH_OUTPUT([malloc], [/* Define to rpl_malloc if the replacement function should be used. */
 @%:@undef malloc])
-m4trace:configure.ac:103: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:108: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
 @%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:103: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
-m4trace:configure.ac:103: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:103: -1- AH_OUTPUT([HAVE_REALLOC], [/* Define to 1 if your system has a GNU libc compatible `realloc\' function,
+m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:108: -1- AH_OUTPUT([HAVE_REALLOC], [/* Define to 1 if your system has a GNU libc compatible `realloc\' function,
    and to 0 otherwise. */
 @%:@undef HAVE_REALLOC])
-m4trace:configure.ac:103: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:103: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS realloc.$ac_objext"])
-m4trace:configure.ac:103: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:103: -1- AC_LIBSOURCE([realloc.c])
-m4trace:configure.ac:103: -1- AC_DEFINE_TRACE_LITERAL([realloc])
-m4trace:configure.ac:103: -1- m4_pattern_allow([^realloc$])
-m4trace:configure.ac:103: -1- AH_OUTPUT([realloc], [/* Define to rpl_realloc if the replacement function should be used. */
+m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:108: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS realloc.$ac_objext"])
+m4trace:configure.ac:108: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:108: -1- AC_LIBSOURCE([realloc.c])
+m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([realloc])
+m4trace:configure.ac:108: -1- m4_pattern_allow([^realloc$])
+m4trace:configure.ac:108: -1- AH_OUTPUT([realloc], [/* Define to rpl_realloc if the replacement function should be used. */
 @%:@undef realloc])
-m4trace:configure.ac:104: -1- AC_CANONICAL_HOST
-m4trace:configure.ac:104: -1- AC_CANONICAL_BUILD
-m4trace:configure.ac:104: -1- AC_REQUIRE_AUX_FILE([config.sub])
-m4trace:configure.ac:104: -1- AC_REQUIRE_AUX_FILE([config.guess])
-m4trace:configure.ac:104: -1- AC_SUBST([build], [$ac_cv_build])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([build])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:104: -1- AC_SUBST([build_cpu], [$[1]])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([build_cpu])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:104: -1- AC_SUBST([build_vendor], [$[2]])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([build_vendor])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:104: -1- AC_SUBST([build_os])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([build_os])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:104: -1- AC_SUBST([host], [$ac_cv_host])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([host])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:104: -1- AC_SUBST([host_cpu], [$[1]])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([host_cpu])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:104: -1- AC_SUBST([host_vendor], [$[2]])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([host_vendor])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:104: -1- AC_SUBST([host_os])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([host_os])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:104: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS strnlen.$ac_objext"])
-m4trace:configure.ac:104: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:104: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:104: -1- AC_LIBSOURCE([strnlen.c])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_ALARM], [/* Define to 1 if you have the `alarm\' function. */
+m4trace:configure.ac:109: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:109: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:109: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:109: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:109: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([build])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:109: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([build_cpu])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:109: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([build_vendor])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:109: -1- AC_SUBST([build_os])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([build_os])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:109: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([host])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:109: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([host_cpu])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:109: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([host_vendor])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:109: -1- AC_SUBST([host_os])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([host_os])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:109: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS strnlen.$ac_objext"])
+m4trace:configure.ac:109: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:109: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:109: -1- AC_LIBSOURCE([strnlen.c])
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_ALARM], [/* Define to 1 if you have the `alarm\' function. */
 @%:@undef HAVE_ALARM])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
 @%:@undef HAVE_ATEXIT])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_ENDPWENT], [/* Define to 1 if you have the `endpwent\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_ENDPWENT], [/* Define to 1 if you have the `endpwent\' function. */
 @%:@undef HAVE_ENDPWENT])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
 @%:@undef HAVE_GETMNTENT])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_GETPASS], [/* Define to 1 if you have the `getpass\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_GETPASS], [/* Define to 1 if you have the `getpass\' function. */
 @%:@undef HAVE_GETPASS])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
 @%:@undef HAVE_GETTIMEOFDAY])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* Define to 1 if you have the `inet_ntop\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* Define to 1 if you have the `inet_ntop\' function. */
 @%:@undef HAVE_INET_NTOP])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
 @%:@undef HAVE_MEMSET])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define to 1 if you have the `realpath\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define to 1 if you have the `realpath\' function. */
 @%:@undef HAVE_REALPATH])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
 @%:@undef HAVE_SETENV])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
 @%:@undef HAVE_STRCHR])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRCMP], [/* Define to 1 if you have the `strcmp\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRCMP], [/* Define to 1 if you have the `strcmp\' function. */
 @%:@undef HAVE_STRCMP])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRDUP], [/* Define to 1 if you have the `strdup\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRDUP], [/* Define to 1 if you have the `strdup\' function. */
 @%:@undef HAVE_STRDUP])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
 @%:@undef HAVE_STRERROR])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRNCASECMP], [/* Define to 1 if you have the `strncasecmp\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRNCASECMP], [/* Define to 1 if you have the `strncasecmp\' function. */
 @%:@undef HAVE_STRNCASECMP])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRNDUP], [/* Define to 1 if you have the `strndup\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRNDUP], [/* Define to 1 if you have the `strndup\' function. */
 @%:@undef HAVE_STRNDUP])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRPBRK], [/* Define to 1 if you have the `strpbrk\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRPBRK], [/* Define to 1 if you have the `strpbrk\' function. */
 @%:@undef HAVE_STRPBRK])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRRCHR], [/* Define to 1 if you have the `strrchr\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRRCHR], [/* Define to 1 if you have the `strrchr\' function. */
 @%:@undef HAVE_STRRCHR])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
 @%:@undef HAVE_STRSTR])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
 @%:@undef HAVE_STRTOL])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
 @%:@undef HAVE_STRTOUL])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_TOLOWER], [/* Define to 1 if you have the `tolower\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_TOLOWER], [/* Define to 1 if you have the `tolower\' function. */
 @%:@undef HAVE_TOLOWER])
-m4trace:configure.ac:107: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
+m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
 @%:@undef HAVE_UNAME])
-m4trace:configure.ac:109: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Define to 1 if you have the `clock_gettime\' function. */
+m4trace:configure.ac:114: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Define to 1 if you have the `clock_gettime\' function. */
 @%:@undef HAVE_CLOCK_GETTIME])
-m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
-m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
-m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
-m4trace:configure.ac:109: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
-m4trace:configure.ac:109: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Whether the clock_gettime func is there */
+m4trace:configure.ac:114: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:114: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:114: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+m4trace:configure.ac:114: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Whether the clock_gettime func is there */
 @%:@undef HAVE_CLOCK_GETTIME])
-m4trace:configure.ac:117: -1- AC_SUBST([RT_LDADD])
-m4trace:configure.ac:117: -1- AC_SUBST_TRACE([RT_LDADD])
-m4trace:configure.ac:117: -1- m4_pattern_allow([^RT_LDADD$])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_ARPA_INET_H], [/* Define to 1 if you have the <arpa/inet.h> header file. */
+m4trace:configure.ac:122: -1- AC_SUBST([RT_LDADD])
+m4trace:configure.ac:122: -1- AC_SUBST_TRACE([RT_LDADD])
+m4trace:configure.ac:122: -1- m4_pattern_allow([^RT_LDADD$])
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_ARPA_INET_H], [/* Define to 1 if you have the <arpa/inet.h> header file. */
 @%:@undef HAVE_ARPA_INET_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
 @%:@undef HAVE_CTYPE_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
 @%:@undef HAVE_FCNTL_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
 @%:@undef HAVE_LIMITS_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_MNTENT_H], [/* Define to 1 if you have the <mntent.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_MNTENT_H], [/* Define to 1 if you have the <mntent.h> header file. */
 @%:@undef HAVE_MNTENT_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
 @%:@undef HAVE_NETDB_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define to 1 if you have the <stddef.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define to 1 if you have the <stddef.h> header file. */
 @%:@undef HAVE_STDDEF_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if you have the <stdbool.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if you have the <stdbool.h> header file. */
 @%:@undef HAVE_STDBOOL_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
 @%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the <stdio.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the <stdio.h> header file. */
 @%:@undef HAVE_STDIO_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
 @%:@undef HAVE_ERRNO_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
 @%:@undef HAVE_STRING_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
 @%:@undef HAVE_STRINGS_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_SYS_MOUNT_H], [/* Define to 1 if you have the <sys/mount.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_SYS_MOUNT_H], [/* Define to 1 if you have the <sys/mount.h> header file. */
 @%:@undef HAVE_SYS_MOUNT_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
 @%:@undef HAVE_SYS_PARAM_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
 @%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
 @%:@undef HAVE_SYS_TIME_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
 @%:@undef HAVE_SYSLOG_H])
-m4trace:configure.ac:120: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:125: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:123: -1- AH_OUTPUT([HAVE_SYS_FSUID_H], [/* Define to 1 if you have the <sys/fsuid.h> header file. */
+m4trace:configure.ac:128: -1- AH_OUTPUT([HAVE_SYS_FSUID_H], [/* Define to 1 if you have the <sys/fsuid.h> header file. */
 @%:@undef HAVE_SYS_FSUID_H])
-m4trace:configure.ac:123: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_FSUID_H])
-m4trace:configure.ac:123: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
-m4trace:configure.ac:132: -1- AC_SUBST([PIE_CFLAGS])
-m4trace:configure.ac:132: -1- AC_SUBST_TRACE([PIE_CFLAGS])
-m4trace:configure.ac:132: -1- m4_pattern_allow([^PIE_CFLAGS$])
-m4trace:configure.ac:139: -1- AC_SUBST([RELRO_CFLAGS])
-m4trace:configure.ac:139: -1- AC_SUBST_TRACE([RELRO_CFLAGS])
-m4trace:configure.ac:139: -1- m4_pattern_allow([^RELRO_CFLAGS$])
-m4trace:configure.ac:142: -1- AH_OUTPUT([HAVE_KRB5_H], [/* Define to 1 if you have the <krb5.h> header file. */
+m4trace:configure.ac:128: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_FSUID_H])
+m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
+m4trace:configure.ac:137: -1- AC_SUBST([PIE_CFLAGS])
+m4trace:configure.ac:137: -1- AC_SUBST_TRACE([PIE_CFLAGS])
+m4trace:configure.ac:137: -1- m4_pattern_allow([^PIE_CFLAGS$])
+m4trace:configure.ac:144: -1- AC_SUBST([RELRO_CFLAGS])
+m4trace:configure.ac:144: -1- AC_SUBST_TRACE([RELRO_CFLAGS])
+m4trace:configure.ac:144: -1- m4_pattern_allow([^RELRO_CFLAGS$])
+m4trace:configure.ac:147: -1- AH_OUTPUT([HAVE_KRB5_H], [/* Define to 1 if you have the <krb5.h> header file. */
 @%:@undef HAVE_KRB5_H])
-m4trace:configure.ac:142: -1- AH_OUTPUT([HAVE_KRB5_KRB5_H], [/* Define to 1 if you have the <krb5/krb5.h> header file. */
+m4trace:configure.ac:147: -1- AH_OUTPUT([HAVE_KRB5_KRB5_H], [/* Define to 1 if you have the <krb5/krb5.h> header file. */
 @%:@undef HAVE_KRB5_KRB5_H])
-m4trace:configure.ac:166: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_KEYBLOCK_KEYVALUE])
-m4trace:configure.ac:166: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
-m4trace:configure.ac:166: -1- AH_OUTPUT([HAVE_KRB5_KEYBLOCK_KEYVALUE], [/* Whether the krb5_keyblock struct has a keyvalue property */
+m4trace:configure.ac:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_KEYBLOCK_KEYVALUE])
+m4trace:configure.ac:171: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
+m4trace:configure.ac:171: -1- AH_OUTPUT([HAVE_KRB5_KEYBLOCK_KEYVALUE], [/* Whether the krb5_keyblock struct has a keyvalue property */
 @%:@undef HAVE_KRB5_KEYBLOCK_KEYVALUE])
-m4trace:configure.ac:171: -1- AH_OUTPUT([HAVE_TALLOC_H], [/* Define to 1 if you have the <talloc.h> header file. */
+m4trace:configure.ac:176: -1- AH_OUTPUT([HAVE_TALLOC_H], [/* Define to 1 if you have the <talloc.h> header file. */
 @%:@undef HAVE_TALLOC_H])
-m4trace:configure.ac:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TALLOC_H])
-m4trace:configure.ac:171: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
-m4trace:configure.ac:181: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
+m4trace:configure.ac:176: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TALLOC_H])
+m4trace:configure.ac:176: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
+m4trace:configure.ac:186: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
 @%:@undef HAVE_KEYUTILS_H])
-m4trace:configure.ac:181: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
-m4trace:configure.ac:181: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
-m4trace:configure.ac:200: -1- AC_SUBST([KRB5_LDADD])
-m4trace:configure.ac:200: -1- AC_SUBST_TRACE([KRB5_LDADD])
-m4trace:configure.ac:200: -1- m4_pattern_allow([^KRB5_LDADD$])
-m4trace:configure.ac:204: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-m4trace:configure.ac:204: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:204: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:204: -1- AC_SUBST([PKG_CONFIG_PATH])
-m4trace:configure.ac:204: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
-m4trace:configure.ac:204: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:204: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-m4trace:configure.ac:204: -1- AC_SUBST([PKG_CONFIG])
-m4trace:configure.ac:204: -1- AC_SUBST_TRACE([PKG_CONFIG])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^PKG_CONFIG$])
-m4trace:configure.ac:204: -1- AC_SUBST([WBCLIENT_CFLAGS])
-m4trace:configure.ac:204: -1- AC_SUBST_TRACE([WBCLIENT_CFLAGS])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
-m4trace:configure.ac:204: -1- AC_SUBST([WBCLIENT_LIBS])
-m4trace:configure.ac:204: -1- AC_SUBST_TRACE([WBCLIENT_LIBS])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
-m4trace:configure.ac:204: -1- AH_OUTPUT([HAVE_LIBWBCLIENT], [/* Define to 1 if you have the `wbclient\' library (-lwbclient). */
+m4trace:configure.ac:186: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
+m4trace:configure.ac:186: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+m4trace:configure.ac:205: -1- AC_SUBST([KRB5_LDADD])
+m4trace:configure.ac:205: -1- AC_SUBST_TRACE([KRB5_LDADD])
+m4trace:configure.ac:205: -1- m4_pattern_allow([^KRB5_LDADD$])
+m4trace:configure.ac:209: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4trace:configure.ac:209: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([PKG_CONFIG])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:209: -1- AC_SUBST([PKG_CONFIG_PATH])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+m4trace:configure.ac:209: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4trace:configure.ac:209: -1- AC_SUBST([PKG_CONFIG])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([PKG_CONFIG])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^PKG_CONFIG$])
+m4trace:configure.ac:209: -1- AC_SUBST([WBCLIENT_CFLAGS])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([WBCLIENT_CFLAGS])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
+m4trace:configure.ac:209: -1- AC_SUBST([WBCLIENT_LIBS])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([WBCLIENT_LIBS])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
+m4trace:configure.ac:209: -1- AH_OUTPUT([HAVE_LIBWBCLIENT], [/* Define to 1 if you have the `wbclient\' library (-lwbclient). */
 @%:@undef HAVE_LIBWBCLIENT])
-m4trace:configure.ac:204: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWBCLIENT])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
-m4trace:configure.ac:204: -1- AH_OUTPUT([HAVE_SYS_XATTR_H], [/* Define to 1 if you have the <sys/xattr.h> header file. */
+m4trace:configure.ac:209: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWBCLIENT])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
+m4trace:configure.ac:209: -1- AH_OUTPUT([HAVE_SYS_XATTR_H], [/* Define to 1 if you have the <sys/xattr.h> header file. */
 @%:@undef HAVE_SYS_XATTR_H])
-m4trace:configure.ac:204: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_XATTR_H])
-m4trace:configure.ac:204: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
-m4trace:configure.ac:207: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WBC_ID_TYPE_BOTH])
-m4trace:configure.ac:207: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
-m4trace:configure.ac:207: -2- AH_OUTPUT([HAVE_WBC_ID_TYPE_BOTH], [/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */
+m4trace:configure.ac:209: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_XATTR_H])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
+m4trace:configure.ac:212: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WBC_ID_TYPE_BOTH])
+m4trace:configure.ac:212: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
+m4trace:configure.ac:212: -2- AH_OUTPUT([HAVE_WBC_ID_TYPE_BOTH], [/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */
 @%:@undef HAVE_WBC_ID_TYPE_BOTH])
-m4trace:configure.ac:210: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
+m4trace:configure.ac:215: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
 @%:@undef HAVE_KEYUTILS_H])
-m4trace:configure.ac:210: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
-m4trace:configure.ac:210: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
-m4trace:configure.ac:223: -1- AH_OUTPUT([HAVE_SECURITY_PAM_APPL_H], [/* Define to 1 if you have the <security/pam_appl.h> header file. */
+m4trace:configure.ac:215: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
+m4trace:configure.ac:215: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+m4trace:configure.ac:228: -1- AH_OUTPUT([HAVE_SECURITY_PAM_APPL_H], [/* Define to 1 if you have the <security/pam_appl.h> header file. */
 @%:@undef HAVE_SECURITY_PAM_APPL_H])
-m4trace:configure.ac:223: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SECURITY_PAM_APPL_H])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$])
-m4trace:configure.ac:240: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY], [/* Define to 1 if you have the `krb5_auth_con_getsendsubkey\' function. */
+m4trace:configure.ac:228: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SECURITY_PAM_APPL_H])
+m4trace:configure.ac:228: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$])
+m4trace:configure.ac:245: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY], [/* Define to 1 if you have the `krb5_auth_con_getsendsubkey\' function. */
 @%:@undef HAVE_KRB5_AUTH_CON_GETSENDSUBKEY])
-m4trace:configure.ac:240: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY])
-m4trace:configure.ac:240: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
-m4trace:configure.ac:245: -1- AH_OUTPUT([HAVE_KRB5_PRINCIPAL_GET_REALM], [/* Define to 1 if you have the `krb5_principal_get_realm\' function. */
+m4trace:configure.ac:245: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY])
+m4trace:configure.ac:245: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
+m4trace:configure.ac:250: -1- AH_OUTPUT([HAVE_KRB5_PRINCIPAL_GET_REALM], [/* Define to 1 if you have the `krb5_principal_get_realm\' function. */
 @%:@undef HAVE_KRB5_PRINCIPAL_GET_REALM])
-m4trace:configure.ac:245: -1- AH_OUTPUT([HAVE_KRB5_FREE_UNPARSED_NAME], [/* Define to 1 if you have the `krb5_free_unparsed_name\' function. */
+m4trace:configure.ac:250: -1- AH_OUTPUT([HAVE_KRB5_FREE_UNPARSED_NAME], [/* Define to 1 if you have the `krb5_free_unparsed_name\' function. */
 @%:@undef HAVE_KRB5_FREE_UNPARSED_NAME])
-m4trace:configure.ac:246: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SETADDRS], [/* Define to 1 if you have the `krb5_auth_con_setaddrs\' function. */
+m4trace:configure.ac:251: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SETADDRS], [/* Define to 1 if you have the `krb5_auth_con_setaddrs\' function. */
 @%:@undef HAVE_KRB5_AUTH_CON_SETADDRS])
-m4trace:configure.ac:246: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype\' function. */
+m4trace:configure.ac:251: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype\' function. */
 @%:@undef HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
-m4trace:configure.ac:250: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_SYSTEMD])
-m4trace:configure.ac:250: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
-m4trace:configure.ac:250: -1- AH_OUTPUT([ENABLE_SYSTEMD], [/* Enable systemd specific behavior for mount.cifs */
+m4trace:configure.ac:255: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_SYSTEMD])
+m4trace:configure.ac:255: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
+m4trace:configure.ac:255: -1- AH_OUTPUT([ENABLE_SYSTEMD], [/* Enable systemd specific behavior for mount.cifs */
 @%:@undef ENABLE_SYSTEMD])
-m4trace:configure.ac:255: -1- AC_SUBST([have_rst2man])
-m4trace:configure.ac:255: -1- AC_SUBST_TRACE([have_rst2man])
-m4trace:configure.ac:255: -1- m4_pattern_allow([^have_rst2man$])
-m4trace:configure.ac:269: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
-m4trace:configure.ac:269: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
-m4trace:configure.ac:269: -1- AH_OUTPUT([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the declaration of
+m4trace:configure.ac:260: -1- AC_SUBST([have_rst2man])
+m4trace:configure.ac:260: -1- AC_SUBST_TRACE([have_rst2man])
+m4trace:configure.ac:260: -1- m4_pattern_allow([^have_rst2man$])
+m4trace:configure.ac:274: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
+m4trace:configure.ac:274: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
+m4trace:configure.ac:274: -1- AH_OUTPUT([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the declaration of
    `krb5_auth_con_set_req_cksumtype\', and to 0 if you don\'t. */
 @%:@undef HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
-m4trace:configure.ac:273: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"])
-m4trace:configure.ac:273: -1- AC_SUBST([CONFIG_MAN_TRUE])
-m4trace:configure.ac:273: -1- AC_SUBST_TRACE([CONFIG_MAN_TRUE])
-m4trace:configure.ac:273: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$])
-m4trace:configure.ac:273: -1- AC_SUBST([CONFIG_MAN_FALSE])
-m4trace:configure.ac:273: -1- AC_SUBST_TRACE([CONFIG_MAN_FALSE])
-m4trace:configure.ac:273: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$])
-m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE])
-m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE])
-m4trace:configure.ac:274: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
-m4trace:configure.ac:274: -1- AC_SUBST([CONFIG_CIFSUPCALL_TRUE])
-m4trace:configure.ac:274: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_TRUE])
-m4trace:configure.ac:274: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
-m4trace:configure.ac:274: -1- AC_SUBST([CONFIG_CIFSUPCALL_FALSE])
-m4trace:configure.ac:274: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_FALSE])
-m4trace:configure.ac:274: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
-m4trace:configure.ac:274: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
-m4trace:configure.ac:274: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
-m4trace:configure.ac:275: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
-m4trace:configure.ac:275: -1- AC_SUBST([CONFIG_CIFSCREDS_TRUE])
-m4trace:configure.ac:275: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_TRUE])
-m4trace:configure.ac:275: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
-m4trace:configure.ac:275: -1- AC_SUBST([CONFIG_CIFSCREDS_FALSE])
-m4trace:configure.ac:275: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_FALSE])
-m4trace:configure.ac:275: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
-m4trace:configure.ac:275: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
-m4trace:configure.ac:275: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
-m4trace:configure.ac:276: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
-m4trace:configure.ac:276: -1- AC_SUBST([CONFIG_CIFSIDMAP_TRUE])
-m4trace:configure.ac:276: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_TRUE])
-m4trace:configure.ac:276: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
-m4trace:configure.ac:276: -1- AC_SUBST([CONFIG_CIFSIDMAP_FALSE])
-m4trace:configure.ac:276: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_FALSE])
-m4trace:configure.ac:276: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
-m4trace:configure.ac:276: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
-m4trace:configure.ac:276: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
-m4trace:configure.ac:277: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
-m4trace:configure.ac:277: -1- AC_SUBST([CONFIG_CIFSACL_TRUE])
-m4trace:configure.ac:277: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_TRUE])
-m4trace:configure.ac:277: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
-m4trace:configure.ac:277: -1- AC_SUBST([CONFIG_CIFSACL_FALSE])
-m4trace:configure.ac:277: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_FALSE])
-m4trace:configure.ac:277: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
-m4trace:configure.ac:277: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
-m4trace:configure.ac:277: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
-m4trace:configure.ac:278: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"])
-m4trace:configure.ac:278: -1- AC_SUBST([CONFIG_PAM_TRUE])
-m4trace:configure.ac:278: -1- AC_SUBST_TRACE([CONFIG_PAM_TRUE])
-m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$])
-m4trace:configure.ac:278: -1- AC_SUBST([CONFIG_PAM_FALSE])
-m4trace:configure.ac:278: -1- AC_SUBST_TRACE([CONFIG_PAM_FALSE])
-m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$])
-m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE])
-m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE])
-m4trace:configure.ac:279: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
-m4trace:configure.ac:279: -1- AC_SUBST([CONFIG_PLUGIN_TRUE])
-m4trace:configure.ac:279: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_TRUE])
-m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
-m4trace:configure.ac:279: -1- AC_SUBST([CONFIG_PLUGIN_FALSE])
-m4trace:configure.ac:279: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_FALSE])
-m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
-m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
-m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
-m4trace:configure.ac:284: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the <sys/capability.h> header file. */
+m4trace:configure.ac:278: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"])
+m4trace:configure.ac:278: -1- AC_SUBST([CONFIG_MAN_TRUE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([CONFIG_MAN_TRUE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$])
+m4trace:configure.ac:278: -1- AC_SUBST([CONFIG_MAN_FALSE])
+m4trace:configure.ac:278: -1- AC_SUBST_TRACE([CONFIG_MAN_FALSE])
+m4trace:configure.ac:278: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE])
+m4trace:configure.ac:278: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE])
+m4trace:configure.ac:279: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
+m4trace:configure.ac:279: -1- AC_SUBST([CONFIG_CIFSUPCALL_TRUE])
+m4trace:configure.ac:279: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_TRUE])
+m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
+m4trace:configure.ac:279: -1- AC_SUBST([CONFIG_CIFSUPCALL_FALSE])
+m4trace:configure.ac:279: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_FALSE])
+m4trace:configure.ac:279: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
+m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
+m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
+m4trace:configure.ac:280: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
+m4trace:configure.ac:280: -1- AC_SUBST([CONFIG_CIFSCREDS_TRUE])
+m4trace:configure.ac:280: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_TRUE])
+m4trace:configure.ac:280: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
+m4trace:configure.ac:280: -1- AC_SUBST([CONFIG_CIFSCREDS_FALSE])
+m4trace:configure.ac:280: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_FALSE])
+m4trace:configure.ac:280: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
+m4trace:configure.ac:280: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
+m4trace:configure.ac:280: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
+m4trace:configure.ac:281: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
+m4trace:configure.ac:281: -1- AC_SUBST([CONFIG_CIFSIDMAP_TRUE])
+m4trace:configure.ac:281: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_TRUE])
+m4trace:configure.ac:281: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
+m4trace:configure.ac:281: -1- AC_SUBST([CONFIG_CIFSIDMAP_FALSE])
+m4trace:configure.ac:281: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_FALSE])
+m4trace:configure.ac:281: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
+m4trace:configure.ac:281: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
+m4trace:configure.ac:281: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
+m4trace:configure.ac:282: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
+m4trace:configure.ac:282: -1- AC_SUBST([CONFIG_CIFSACL_TRUE])
+m4trace:configure.ac:282: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_TRUE])
+m4trace:configure.ac:282: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
+m4trace:configure.ac:282: -1- AC_SUBST([CONFIG_CIFSACL_FALSE])
+m4trace:configure.ac:282: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_FALSE])
+m4trace:configure.ac:282: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
+m4trace:configure.ac:282: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
+m4trace:configure.ac:282: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
+m4trace:configure.ac:283: -1- AM_CONDITIONAL([CONFIG_SMBINFO], [test "$enable_smbinfo" != "no"])
+m4trace:configure.ac:283: -1- AC_SUBST([CONFIG_SMBINFO_TRUE])
+m4trace:configure.ac:283: -1- AC_SUBST_TRACE([CONFIG_SMBINFO_TRUE])
+m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_SMBINFO_TRUE$])
+m4trace:configure.ac:283: -1- AC_SUBST([CONFIG_SMBINFO_FALSE])
+m4trace:configure.ac:283: -1- AC_SUBST_TRACE([CONFIG_SMBINFO_FALSE])
+m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_SMBINFO_FALSE$])
+m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_TRUE])
+m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_FALSE])
+m4trace:configure.ac:284: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"])
+m4trace:configure.ac:284: -1- AC_SUBST([CONFIG_PAM_TRUE])
+m4trace:configure.ac:284: -1- AC_SUBST_TRACE([CONFIG_PAM_TRUE])
+m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$])
+m4trace:configure.ac:284: -1- AC_SUBST([CONFIG_PAM_FALSE])
+m4trace:configure.ac:284: -1- AC_SUBST_TRACE([CONFIG_PAM_FALSE])
+m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$])
+m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE])
+m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE])
+m4trace:configure.ac:285: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
+m4trace:configure.ac:285: -1- AC_SUBST([CONFIG_PLUGIN_TRUE])
+m4trace:configure.ac:285: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_TRUE])
+m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
+m4trace:configure.ac:285: -1- AC_SUBST([CONFIG_PLUGIN_FALSE])
+m4trace:configure.ac:285: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_FALSE])
+m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
+m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
+m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
+m4trace:configure.ac:290: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the <sys/capability.h> header file. */
 @%:@undef HAVE_SYS_CAPABILITY_H])
-m4trace:configure.ac:284: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPABILITY_H])
-m4trace:configure.ac:284: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
-m4trace:configure.ac:284: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP])
-m4trace:configure.ac:284: -1- m4_pattern_allow([^HAVE_LIBCAP$])
-m4trace:configure.ac:284: -1- AH_OUTPUT([HAVE_LIBCAP], [/* Define if libcap exists */
+m4trace:configure.ac:290: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPABILITY_H])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
+m4trace:configure.ac:290: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^HAVE_LIBCAP$])
+m4trace:configure.ac:290: -1- AH_OUTPUT([HAVE_LIBCAP], [/* Define if libcap exists */
 @%:@undef HAVE_LIBCAP])
-m4trace:configure.ac:284: -1- AC_SUBST([LIBCAP])
-m4trace:configure.ac:284: -1- AC_SUBST_TRACE([LIBCAP])
-m4trace:configure.ac:284: -1- m4_pattern_allow([^LIBCAP$])
-m4trace:configure.ac:286: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:286: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:286: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:286: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:286: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:290: -1- AC_SUBST([LIBCAP])
+m4trace:configure.ac:290: -1- AC_SUBST_TRACE([LIBCAP])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^LIBCAP$])
+m4trace:configure.ac:292: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:292: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:292: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:292: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:292: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:292: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:292: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:292: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:292: -1- AC_SUBST_TRACE([MKDIR_P])
diff --git a/checkopts b/checkopts
 new file mode 100755
index 0000000..88e70b1
--- /dev/null
+++ b/checkopts
@@ -0,0 +1,253 @@
+#!/usr/bin/env python3
+#
+# Script to check for inconsistencies between documented mount options
+# and implemented kernel options.
+# Copyright (C) 2018 Aurelien Aptel ([e-mail])
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+import re
+import subprocess
+import argparse
+from pprint import pprint as P
+
+def extract_canonical_opts(s):
+    """
+    Return list of option names present in s.
+    e.g "opt1=a|opt2=d" => ["opt1", "opt2"])
+    """
+    opts = s.split("|")
+    res = []
+    for o in opts:
+        x = o.split("=")
+        res.append(x[0])
+    return res
+
+def extract_kernel_opts(fn):
+    STATE_BASE = 0
+    STATE_DEF = 1
+    STATE_USE = 2
+    STATE_EXIT = 3
+
+    state = STATE_BASE
+    fmt2enum = {}
+    enum2code = {}
+    code = ''
+    current_opt = ''
+    rx = RX()
+
+    def code_add(s):
+        if current_opt != '':
+            if current_opt not in enum2code:
+                enum2code[current_opt] = ''
+            enum2code[current_opt] += s
+
+    with open(fn) as f:
+        for s in f.readlines():
+            if state == STATE_EXIT:
+                break
+
+            elif state == STATE_BASE:
+                if rx.search(r'cifs_mount_option_tokens.*\{', s):
+                    state = STATE_DEF
+                elif rx.search(r'^cifs_parse_mount_options', s):
+                    state = STATE_USE
+
+            elif state == STATE_DEF:
+                if rx.search(r'(Opt_[a-zA-Z0-9_]+)\s*,\s*"([^"]+)"', s):
+                    fmt = rx.group(2)
+                    opts = extract_canonical_opts(fmt)
+                    assert(len(opts) == 1)
+                    name = opts[0]
+                    fmt2enum[name] = {'enum':rx.group(1), 'fmt':fmt}
+                elif rx.search(r'^};', s):
+                    state = STATE_BASE
+
+            elif state == STATE_USE:
+                if rx.search(r'^\s*case (Opt_[a-zA-Z0-9_]+)', s):
+                    current_opt = rx.group(1)
+                elif current_opt != '' and rx.search(r'^\s*default:', s):
+                    state = STATE_EXIT
+                else:
+                    code_add(s)
+    return fmt2enum, enum2code
+
+def chomp(s):
+    if s[-1] == '\n':
+        return s[:-1]
+    return s
+
+def extract_man_opts(fn):
+    STATE_EXIT = 0
+    STATE_BASE = 1
+    STATE_OPT = 2
+
+    state = STATE_BASE
+    rx = RX()
+    opts = {}
+    ln = 0
+
+    with open(fn) as f:
+        for s in f.readlines():
+            ln += 1
+
+            if state == STATE_EXIT:
+                break
+
+            elif state == STATE_BASE:
+                if rx.search(r'^OPTION', s):
+                    state = STATE_OPT
+
+            elif state == STATE_OPT:
+                if rx.search('^[a-z]', s) and len(s) < 50:
+                    s = chomp(s)
+                    names = extract_canonical_opts(s)
+                    for name in names:
+                        if name not in opts:
+                            opts[name] = []
+                        opts[name].append({'ln':ln, 'fmt':s})
+                elif rx.search(r'^[A-Z]+', s):
+                    state = STATE_EXIT
+    return opts
+
+def format_code(s):
+    # remove common indent in the block
+    min_indent = None
+    for ln in s.split("\n"):
+        indent = 0
+        for c in ln:
+            if c == '\t': indent += 1
+            else: break
+        if min_indent is None:
+            min_indent = indent
+        elif indent > 0:
+            min_indent = min(indent, min_indent)
+    out = ''
+    lines = s.split("\n")
+    if lines[-1].strip() == '':
+        lines.pop()
+    for ln in lines:
+        out += "| %s\n" % ln[min_indent:]
+    return out
+
+def sortedset(s):
+    return sorted(list(s), key=lambda x: re.sub('^no', '', x))
+
+def opt_neg(opt):
+    if opt.startswith("no"):
+        return opt[2:]
+    else:
+        return "no"+opt
+
+def main():
+    ap = argparse.ArgumentParser(description="Cross-check mount options from cifs.ko/man page")
+    ap.add_argument("cfile", help="path to connect.c")
+    ap.add_argument("rstfile", help="path to mount.cifs.rst")
+    args = ap.parse_args()
+
+    fmt2enum, enum2code = extract_kernel_opts(args.cfile)
+    manopts = extract_man_opts(args.rstfile)
+
+    kernel_opts_set = set(fmt2enum.keys())
+    man_opts_set = set(manopts.keys())
+
+    def opt_alias_is_doc(o):
+        enum = fmt2enum[o]['enum']
+        aliases = []
+        for k,v in fmt2enum.items():
+            if k != o and v['enum'] == enum:
+                if opt_is_doc(k):
+                    return k
+        return None
+
+    def opt_exists(o):
+        return o in fmt2enum
+
+    def opt_is_doc(o):
+        return o in manopts
+
+    print('DUPLICATED DOC OPTIONS')
+    print('======================')
+
+    for opt in sortedset(man_opts_set):
+        if len(manopts[opt]) > 1:
+            lines = ", ".join([str(x['ln']) for x in manopts[opt]])
+            print("OPTION %-20.20s (lines %s)"%(opt, lines))
+    print()
+
+    print('UNDOCUMENTED OPTIONS')
+    print('====================')
+
+    undoc_opts = kernel_opts_set - man_opts_set
+    # group opts and their negations together
+    for opt in sortedset(undoc_opts):
+        fmt = fmt2enum[opt]['fmt']
+        enum = fmt2enum[opt]['enum']
+        code = format_code(enum2code[enum])
+        neg = opt_neg(opt)
+
+        if enum == 'Opt_ignore':
+            print("# skipping %s (Opt_ignore)\n"%opt)
+            continue
+
+        if opt_exists(neg) and opt_is_doc(neg):
+            print("# skipping %s (%s is documented)\n"%(opt, neg))
+            continue
+
+        alias = opt_alias_is_doc(opt)
+        if alias:
+            print("# skipping %s (alias %s is documented)\n"%(opt, alias))
+            continue
+
+        print('OPTION %s ("%s" -> %s):\n%s'%(opt, fmt, enum, code))
+
+    print('')
+    print('DOCUMENTED BUT NON-EXISTING OPTIONS')
+    print('===================================')
+
+    unex_opts = man_opts_set - kernel_opts_set
+    # group opts and their negations together
+    for opt in sortedset(unex_opts):
+        man = manopts[opt][0]
+        print('OPTION %s ("%s") line %d' % (opt, man['fmt'], man['ln']))
+
+
+    print('')
+    print('NEGATIVE OPTIONS WITHOUT POSITIVE')
+    print('=================================')
+
+    for opt in sortedset(kernel_opts_set):
+        if not opt.startswith('no'):
+            continue
+
+        neg = opt[2:]
+        if not opt_exists(neg):
+            print("OPTION %s exists but not %s"%(opt,neg))
+
+# little helper to test AND store result at the same time so you can
+# do if/elsif easily instead of nesting them when you need to do
+# captures
+class RX:
+    def __init__(self):
+        pass
+    def search(self, rx, s, flags=0):
+        self.r = re.search(rx, s, flags)
+        return self.r
+    def group(self, n):
+        return self.r.group(n)
+
+if __name__ == '__main__':
+    main()
diff --git a/cifs.idmap.rst.in b/cifs.idmap.rst.in
index 91b585e..60d7f0a 100644
--- a/cifs.idmap.rst.in
+++ b/cifs.idmap.rst.in
@@ -11,124 +11,93 @@ Userspace helper for mapping ids for Common Internet File System (CIFS)
 SYNOPSIS
 ********
 
-
-cifs.idmap [--help|-h] [--timeout|-t] [--version|-v] {keyid}
-
+  cifs.idmap [--help|-h] [--timeout|-t] [--version|-v] {keyid}
 
 ***********
 DESCRIPTION
 ***********
 
-
 This tool is part of the cifs-utils suite.
 
-\ **cifs.idmap**\  is a userspace helper program for the linux CIFS client
+``cifs.idmap``  is a userspace helper program for the linux CIFS client
 filesystem. There are a number of activities that the kernel cannot
 easily do itself. This program is a callout program that does these
 things for the kernel and then returns the result.
 
-\ **cifs.idmap**\  is generally intended to be run when the kernel calls
+``cifs.idmap``  is generally intended to be run when the kernel calls
 request-key(8) for a particular key type. While it can be run
 directly from the command-line, it is not generally intended to be run
 that way.
 
-This program is only called if a share is mounted with the \ **cifsacl**\ 
+This program is only called if a share is mounted with the ``cifsacl``
 mount option. The kernel will only upcall to do this conversion if
 that mount option is specified.
 
-\ **cifs.idmap**\  relies on a plugin to handle the ID mapping. If it can't
+``cifs.idmap``  relies on a plugin to handle the ID mapping. If it can't
 find the plugin then it will not work properly. The plugin (or a
 symlink to it) must be at @pluginpath@.
 
-In the case where \ **cifs.idmap**\  or the plugin are unavailable, file
+In the case where ``cifs.idmap`` or the plugin are unavailable, file
 objects in a mounted share are assigned uid and gid of the credentials
 of the process that mounted the share. It is strongly recomemended to
 use mount options of uid and gid to specify a default uid and gid to
 map owner SIDs and group SIDs in this situation.
 
-
 *******
 OPTIONS
 *******
 
+--help|-h
+  Print the usage message and exit.
 
+--timeout|-t
+  Set the expiration timer, in seconds on the key. The default is 600
+  seconds (10 minutes). Setting this to 0 will cause the key to never
+  expire.
 
-\ **--help|-h**\ 
- 
- Print the usage message and exit.
- 
-
-
-\ **--timeout|-t**\ 
- 
- Set the expiration timer, in seconds on the key. The default is 600
- seconds (10 minutes). Setting this to 0 will cause the key to never
- expire.
- 
-
-
-\ **--version|-v**\ 
- 
- Print version number and exit.
- 
-
-
+--version|-v
+  Print version number and exit.
 
 ************************
 CONFIGURATION FOR KEYCTL
 ************************
 
-
-\ **cifs.idmap**\  is designed to be called from the kernel via the
+``cifs.idmap``  is designed to be called from the kernel via the
 request-key callout program. This requires that request-key be told
-where and how to call this program.  Currently \ **cifs.idmap**\  handles a
-key type of:
+where and how to call this program.  Currently ``cifs.idmap``  handles a
+key type of::
 
+  cifs.idmap
 
-\ **cifs.idmap**\ 
- 
- This keytype is for mapping a SID to either an uid or a gid
- 
-
+This keytype is for mapping a SID to either an uid or a gid.
 
 To make this program useful for CIFS, you will need to set up entry for it in
-request-key.conf(5). Here is an example of an entry for this key type:
-
-
-.. code-block:: perl
+request-key.conf(5). Here is an example of an entry for this key type::
 
      #OPERATION  TYPE           D C PROGRAM ARG1 ARG2...
      #=========  =============  = = ================================
      create      cifs.idmap     * * @sbindir@/cifs.idmap %k
 
-
 See request-key.conf(5) for more info on each field.
 
-
 *****
 NOTES
 *****
 
-
 Support for upcalls to cifs.idmap was initially introduced in the 3.0
 kernel.
 
-
 ********
 SEE ALSO
 ********
 
-
 request-key.conf(5), mount.cifs(8)
 
-
 ******
 AUTHOR
 ******
 
-
 Shirish Pargaonkar wrote the cifs.idmap program.
 
 The Linux CIFS Mailing list is the preferred place to ask questions
 regarding these programs.
-
diff --git a/cifs.upcall.c b/cifs.upcall.c
index 89563fd..1559434 100644
--- a/cifs.upcall.c
+++ b/cifs.upcall.c
@@ -63,6 +63,8 @@
 static krb5_context	context;
 static const char	*prog = "cifs.upcall";
 
+#define DNS_RESOLVER_DEFAULT_TIMEOUT 600 /* 10 minutes */
+
 typedef enum _sectype {
 	NONE = 0,
 	KRB5,
@@ -124,6 +126,7 @@ drop_all_capabilities(void)
 static int
 trim_capabilities(bool unused)
 {
+	(void)unused;
 	return 0;
 }
 
@@ -749,19 +752,48 @@ decode_key_description(const char *desc, struct decoded_args *arg)
 	return retval;
 }
 
-static int cifs_resolver(const key_serial_t key, const char *key_descr)
+static int setup_key(const key_serial_t key, const void *data, size_t datalen)
+{
+	int rc;
+
+	rc = keyctl_instantiate(key, data, datalen, 0);
+	if (rc) {
+		switch (errno) {
+		case ENOMEM:
+		case EDQUOT:
+			rc = keyctl_clear(key);
+			if (rc) {
+				syslog(LOG_ERR, "%s: keyctl_clear: %s",
+				       __func__, strerror(errno));
+				return rc;
+			}
+			rc = keyctl_instantiate(key, data, datalen, 0);
+			break;
+		default:
+			;
+		}
+	}
+	if (rc) {
+		syslog(LOG_ERR, "%s: keyctl_instantiate: %s",
+		       __func__, strerror(errno));
+	}
+	return rc;
+}
+
+static int cifs_resolver(const key_serial_t key, const char *key_descr,
+			 const char *key_buf, unsigned expire_time)
 {
 	int c;
 	struct addrinfo *addr;
 	char ip[INET6_ADDRSTRLEN];
 	void *p;
-	const char *keyend = key_descr;
+	const char *keyend = key_buf;
 	/* skip next 4 ';' delimiters to get to description */
 	for (c = 1; c <= 4; c++) {
 		keyend = index(keyend + 1, ';');
 		if (!keyend) {
 			syslog(LOG_ERR, "invalid key description: %s",
-			       key_descr);
+			       key_buf);
 			return 1;
 		}
 	}
@@ -787,15 +819,21 @@ static int cifs_resolver(const key_serial_t key, const char *key_descr)
 		return 1;
 	}
 
-	/* setup key */
-	c = keyctl_instantiate(key, ip, strlen(ip) + 1, 0);
-	if (c == -1) {
-		syslog(LOG_ERR, "%s: keyctl_instantiate: %s", __func__,
+	/* needed for keyctl_set_timeout() */
+	request_key("keyring", key_descr, NULL, KEY_SPEC_THREAD_KEYRING);
+
+	c = setup_key(key, ip, strlen(ip) + 1);
+	if (c) {
+		freeaddrinfo(addr);
+		return 1;
+	}
+	c = keyctl_set_timeout(key, expire_time);
+	if (c) {
+		syslog(LOG_ERR, "%s: keyctl_set_timeout: %s", __func__,
 		       strerror(errno));
 		freeaddrinfo(addr);
 		return 1;
 	}
-
 	freeaddrinfo(addr);
 	return 0;
 }
@@ -864,7 +902,7 @@ lowercase_string(char *c)
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: %s [ -K /path/to/keytab] [-k /path/to/krb5.conf] [-E] [-t] [-v] [-l] key_serial\n", prog);
+	fprintf(stderr, "Usage: %s [ -K /path/to/keytab] [-k /path/to/krb5.conf] [-E] [-t] [-v] [-l] [-e nsecs] key_serial\n", prog);
 }
 
 static const struct option long_options[] = {
@@ -874,6 +912,7 @@ static const struct option long_options[] = {
 	{"trust-dns", 0, NULL, 't'},
 	{"keytab", 1, NULL, 'K'},
 	{"version", 0, NULL, 'v'},
+	{"expire", 1, NULL, 'e'},
 	{NULL, 0, NULL, 0}
 };
 
@@ -897,13 +936,15 @@ int main(const int argc, char *const argv[])
 	char *env_cachename = NULL;
 	krb5_ccache ccache = NULL;
 	struct passwd *pw;
+	unsigned expire_time = DNS_RESOLVER_DEFAULT_TIMEOUT;
+	const char *key_descr = NULL;
 
 	hostbuf[0] = '\0';
 	memset(&arg, 0, sizeof(arg));
 
 	openlog(prog, 0, LOG_DAEMON);
 
-	while ((c = getopt_long(argc, argv, "cEk:K:ltv", long_options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "cEk:K:ltve:", long_options, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			/* legacy option -- skip it */
@@ -931,6 +972,9 @@ int main(const int argc, char *const argv[])
 			rc = 0;
 			printf("version: %s\n", VERSION);
 			goto out;
+		case 'e':
+			expire_time = strtoul(optarg, NULL, 10);
+			break;
 		default:
 			syslog(LOG_ERR, "unknown option: %c", c);
 			goto out;
@@ -965,9 +1009,12 @@ int main(const int argc, char *const argv[])
 
 	syslog(LOG_DEBUG, "key description: %s", buf);
 
-	if ((strncmp(buf, "cifs.resolver", sizeof("cifs.resolver") - 1) == 0) ||
-	    (strncmp(buf, "dns_resolver", sizeof("dns_resolver") - 1) == 0)) {
-		rc = cifs_resolver(key, buf);
+	if (strncmp(buf, "cifs.resolver", sizeof("cifs.resolver") - 1) == 0)
+		key_descr = ".cifs.resolver";
+	else if (strncmp(buf, "dns_resolver", sizeof("dns_resolver") - 1) == 0)
+		key_descr = ".dns_resolver";
+	if (key_descr) {
+		rc = cifs_resolver(key, key_descr, buf, expire_time);
 		goto out;
 	}
 
@@ -1193,16 +1240,8 @@ retry_new_hostname:
 	memcpy(&(keydata->data) + keydata->sesskey_len,
 	       secblob.data, secblob.length);
 
-	/* setup key */
-	rc = keyctl_instantiate(key, keydata, datalen, 0);
-	if (rc == -1) {
-		syslog(LOG_ERR, "keyctl_instantiate: %s", strerror(errno));
-		goto out;
-	}
+	rc = setup_key(key, keydata, datalen);
 
-	/* BB: maybe we need use timeout for key: for example no more then
-	 * ticket lifietime? */
-	/* keyctl_set_timeout( key, 60); */
 out:
 	/*
 	 * on error, negatively instantiate the key ourselves so that we can
diff --git a/cifs.upcall.rst.in b/cifs.upcall.rst.in
index 8f4ee62..08ce324 100644
--- a/cifs.upcall.rst.in
+++ b/cifs.upcall.rst.in
@@ -7,178 +7,134 @@ Userspace upcall helper for Common Internet File System (CIFS)
 --------------------------------------------------------------
 :Manual section: 8
 
-
 ********
 SYNOPSIS
 ********
 
-.. code-block:: perl
-
-     cifs.upcall [--trust-dns|-t] [--version|-v] [--legacy-uid|-l]
-                 [--krb5conf=/path/to/krb5.conf|-k /path/to/krb5.conf]
- 		 [--keytab=/path/to/keytab|-K /path/to/keytab] {keyid}
-
-
+  cifs.upcall [--trust-dns|-t] [--version|-v] [--legacy-uid|-l]
+              [--krb5conf=/path/to/krb5.conf|-k /path/to/krb5.conf]
+              [--keytab=/path/to/keytab|-K /path/to/keytab] [--expire|-e nsecs] {keyid}
 
 ***********
 DESCRIPTION
 ***********
 
-
 This tool is part of the cifs-utils suite.
 
-\ **cifs.upcall**\  is a userspace helper program for the linux CIFS client
+``cifs.upcall`` is a userspace helper program for the linux CIFS client
 filesystem. There are a number of activities that the kernel cannot
 easily do itself. This program is a callout program that does these
 things for the kernel and then returns the result.
 
-\ **cifs.upcall**\  is generally intended to be run when the kernel calls
+``cifs.upcall`` is generally intended to be run when the kernel calls
 request-key(8) for a particular key type. While it can be run
 directly from the command-line, it's not generally intended to be run
 that way.
 
-
 *******
 OPTIONS
 *******
 
-
-
-\ **-c**\ 
- 
- This option is deprecated and is currently ignored.
- 
-
-
-\ **--no-env-probe|-E**\ 
- 
- Normally, \ **cifs.upcall**\  will probe the environment variable space of
- the process that initiated the upcall in order to fetch the value of
- \ ``$KRB5CCNAME``\ . This can assist the program with finding credential
- caches in non-default locations. If this option is set, then the
- program won't do this and will rely on finding credcaches in the
- default locations specified in \ *krb5.conf*\ . Note that this is never
- performed when the uid is 0. The default credcache location is always
- used when the uid is 0, regardless of the environment variable setting
- in the process.
- 
-
-
-\ **--krb5conf|-k=/path/to/krb5.conf**\ 
- 
- This option allows administrators to set an alternate location for the
- \ *krb5.conf*\  file that \ **cifs.upcall**\  will use.
- 
-
-
-\ **--keytab=|-K=/path/to/keytab**\ 
- 
- This option allows administrators to specify a keytab file to be
- used. When a user has no credential cache already established,
- \ **cifs.upcall**\  will attempt to use this keytab to acquire them. The
- default is the system-wide keytab \ */etc/krb5.keytab*\ .
- 
-
-
-\ **--trust-dns|-t**\ 
- 
- With krb5 upcalls, the name used as the host portion of the service
- principal defaults to the hostname portion of the UNC. This option
- allows the upcall program to reverse resolve the network address of
- the server in order to get the hostname.
- 
- This is less secure than not trusting DNS. When using this option,
- it's possible that an attacker could get control of DNS and trick the
- client into mounting a different server altogether. It's preferable to
- instead add server principals to the KDC for every possible hostname,
- but this option exists for cases where that isn't possible. The
- default is to not trust reverse hostname lookups in this fashion.
- 
-
-
-\ **--legacy-uid|-l**\ 
- 
- Traditionally, the kernel has sent only a single uid= parameter to the
- upcall for the SPNEGO upcall that's used to determine what user's
- credential cache to use.  This parameter is affected by the \ **uid=**\ 
- mount option, which also governs the ownership of files on the mount.
- 
- Newer kernels send a creduid= option as well, which contains what uid
- it thinks actually owns the credentials that it's looking for. At
- mount time, this is generally set to the real uid of the user doing
- the mount. For multisession mounts, it's set to the fsuid of the mount
- user. Set this option if you want cifs.upcall to use the older \ **uid=**\ 
- parameter instead of the creduid= parameter.
- 
-
-
-\ **--version|-v**\ 
- 
- Print version number and exit.
- 
-
-
+-c
+  This option is deprecated and is currently ignored.
+
+--no-env-probe|-E
+  Normally, ``cifs.upcall`` will probe the environment variable space of
+  the process that initiated the upcall in order to fetch the value of
+  ``$KRB5CCNAME``. This can assist the program with finding credential
+  caches in non-default locations. If this option is set, then the
+  program won't do this and will rely on finding credcaches in the
+  default locations specified in *krb5.conf*. Note that this is never
+  performed when the uid is 0. The default credcache location is always
+  used when the uid is 0, regardless of the environment variable setting
+  in the process.
+
+--krb5conf|-k=/path/to/krb5.conf
+  This option allows administrators to set an alternate location for the
+  *krb5.conf* file that ``cifs.upcall`` will use.
+
+--keytab=|-K=/path/to/keytab
+  This option allows administrators to specify a keytab file to be
+  used. When a user has no credential cache already established,
+  ``cifs.upcall`` will attempt to use this keytab to acquire them. The
+  default is the system-wide keytab */etc/krb5.keytab*.
+
+--trust-dns|-t
+  With krb5 upcalls, the name used as the host portion of the service
+  principal defaults to the hostname portion of the UNC. This option
+  allows the upcall program to reverse resolve the network address of
+  the server in order to get the hostname.
+
+  This is less secure than not trusting DNS. When using this option,
+  it's possible that an attacker could get control of DNS and trick the
+  client into mounting a different server altogether. It's preferable to
+  instead add server principals to the KDC for every possible hostname,
+  but this option exists for cases where that isn't possible. The
+  default is to not trust reverse hostname lookups in this fashion.
+
+--legacy-uid|-l
+  Traditionally, the kernel has sent only a single uid= parameter to the
+  upcall for the SPNEGO upcall that's used to determine what user's
+  credential cache to use.  This parameter is affected by the uid=
+  mount option, which also governs the ownership of files on the mount.
+
+  Newer kernels send a creduid= option as well, which contains what uid
+  it thinks actually owns the credentials that it's looking for. At
+  mount time, this is generally set to the real uid of the user doing
+  the mount. For multisession mounts, it's set to the fsuid of the mount
+  user. Set this option if you want cifs.upcall to use the older uid=
+  parameter instead of the creduid= parameter.
+
+--expire|-e
+  Override default timeout value (600 seconds) for ``dns_resolver`` key.
+
+--version|-v
+  Print version number and exit.
 
 ************************
 CONFIGURATION FOR KEYCTL
 ************************
 
-
-\ **cifs.upcall**\  is designed to be called from the kernel via the
+``cifs.upcall`` is designed to be called from the kernel via the
 request-key callout program. This requires that request-key be told
-where and how to call this program.  The current \ **cifs.upcall**\ 
+where and how to call this program.  The current ``cifs.upcall``
 program handles two different key types:
 
+cifs.spnego
+  This keytype is for retrieving kerberos session keys
+
+dns_resolver
+  This key type is for resolving hostnames into IP addresses. Support
+  for this key type may eventually be deprecated (see below).
+
+  To make this program useful for CIFS, you'll need to set up entries
+  for them in request-key.conf(5). Here's an example of an entry for
+  each key type::
 
-\ **cifs.spnego**\ 
- 
- This keytype is for retrieving kerberos session keys
- 
-
-
-\ **dns_resolver**\ 
- 
- This key type is for resolving hostnames into IP addresses. Support
- for this key type may eventually be deprecated (see below).
- 
- To make this program useful for CIFS, you'll need to set up entries
- for them in request-key.conf(5). Here's an example of an entry for
- each key type:
- 
- 
- .. code-block:: perl
- 
       #OPERATION  TYPE           D C PROGRAM ARG1 ARG2...
       #=========  =============  = = ================================
       create      cifs.spnego    * * @sbindir@/cifs.upcall %k
       create      dns_resolver   * * @sbindir@/cifs.upcall %k
- 
- 
- See request-key.conf(5) for more info on each field.
- 
- The keyutils package has also started including a dns_resolver
- handling program as well that is preferred over the one in
- \ **cifs.upcall.**\  If you are using a keyutils version equal to or
- greater than 1.5, you should use \ ``key.dns_resolver``\  to handle the
- \ ``dns_resolver``\  keytype instead of \ **cifs.upcall**\ . See
- key.dns_resolver(8) for more info.
- 
 
+  See request-key.conf(5) for more info on each field.
 
+  The keyutils package has also started including a dns_resolver
+  handling program as well that is preferred over the one in
+  ``cifs.upcall``. If you are using a keyutils version equal to or
+  greater than 1.5, you should use ``key.dns_resolver`` to handle the
+  ``dns_resolver`` keytype instead of ``cifs.upcall``. See
+  key.dns_resolver(8) for more info.
 
 ********
 SEE ALSO
 ********
 
-
 request-key.conf(5), mount.cifs(8), key.dns_resolver(8)
 
-
 ******
 AUTHOR
 ******
 
-
 Igor Mammedov wrote the cifs.upcall program.
 
 Jeff Layton authored this manpage.
@@ -187,4 +143,3 @@ The maintainer of the Linux CIFS VFS is Steve French.
 
 The Linux CIFS Mailing list is the preferred place to ask questions
 regarding these programs.
-
diff --git a/cifscreds.rst b/cifscreds.rst
index 5c2a195..a6676cb 100644
--- a/cifscreds.rst
+++ b/cifscreds.rst
@@ -5,125 +5,91 @@ cifscreds
 -----------------------------------------
 manage NTLM credentials in kernel keyring
 -----------------------------------------
-
 :Manual section: 1
 
 ********
 SYNOPSIS
 ********
 
-
-cifscreds add|clear|clearall|update [-u username] [-d] host|domain
-
+  cifscreds add|clear|clearall|update [-u username] [-d] host|domain
 
 ***********
 DESCRIPTION
 ***********
 
-
-The \ **cifscreds**\  program is a tool for managing credentials (username
+The ``cifscreds``  program is a tool for managing credentials (username
 and password) for the purpose of establishing sessions in multiuser
 mounts.
 
 When a cifs filesystem is mounted with the "multiuser" option, and does
 not use krb5 authentication, it needs to be able to get the credentials
-for each user from somewhere. The \ **cifscreds**\  program is the tool used
+for each user from somewhere. The ``cifscreds`` program is the tool used
 to provide these credentials to the kernel.
 
 The first non-option argument to cifscreds is a command (see the
-\ **COMMANDS**\  section below). The second non-option argument is a hostname
+`COMMANDS`_  section below). The second non-option argument is a hostname
 or address, or an NT domain name.
 
-
 ********
 COMMANDS
 ********
 
+add
+  Add credentials to the kernel to be used for connecting to the given
+  server, or servers in the given domain.
 
+clear
+  Clear credentials for a particular host or domain from the kernel.
 
-\ **add**\ 
- 
- Add credentials to the kernel to be used for connecting to the given server, or servers in the given domain.
- 
-
-
-\ **clear**\ 
- 
- Clear credentials for a particular host or domain from the kernel.
- 
-
-
-\ **clearall**\ 
- 
- Clear all cifs credentials from the kernel.
- 
-
-
-\ **update**\ 
- 
- Update stored credentials in the kernel with a new username and
- password.
- 
-
+clearall
+  Clear all cifs credentials from the kernel.
 
+update
+  Update stored credentials in the kernel with a new username and
+  password.
 
 *******
 OPTIONS
 *******
 
+-d, --domain
+  The provided host/domain argument is a NT domainname.
 
+  Ordinarily the second argument provided to cifscreds is treated as a
+  hostname or IP address. This option causes the cifscreds program to
+  treat that argument as an NT domainname instead.
 
-\ **-d**\ , \ **--domain**\ 
- 
- The provided host/domain argument is a NT domainname.
- 
- Ordinarily the second argument provided to cifscreds is treated as a
- hostname or IP address. This option causes the cifscreds program to
- treat that argument as an NT domainname instead.
- 
- If there are not host specific credentials for the mounted server, then
- the kernel will next look for a set of domain credentials equivalent to
- the domain= option provided at mount time.
- 
-
-
-\ **-u**\ , \ **--username**\ 
- 
- Ordinarily, the username is derived from the unix username of the user
- adding the credentials. This option allows the user to substitute a
- different username.
- 
-
+  If there are not host specific credentials for the mounted server, then
+  the kernel will next look for a set of domain credentials equivalent to
+  the domain= option provided at mount time.
 
+-u, --username
+  Ordinarily, the username is derived from the unix username of the user
+  adding the credentials. This option allows the user to substitute a
+  different username.
 
 *****
 NOTES
 *****
 
-
 The cifscreds utility requires a kernel built with support for the
-\ **login**\  key type. That key type was added in v3.3 in mainline Linux
+``login`` key type. That key type was added in v3.3 in mainline Linux
 kernels.
 
-Since \ **cifscreds**\  adds keys to the session keyring, it is highly
-recommended that one use \ **pam_keyinit**\  to ensure that a session keyring
+Since ``cifscreds`` adds keys to the session keyring, it is highly
+recommended that one use ``pam_keyinit`` to ensure that a session keyring
 is established at login time.
 
-
 ********
 SEE ALSO
 ********
 
-
 pam_keyinit(8)
 
-
 *******
 AUTHORS
 *******
 
-
 The cifscreds program was originally developed by Igor Druzhinin
 <[e-mail]>. This manpage and a redesign of the code was done
 by Jeff Layton <[e-mail]>.
-
diff --git a/configure b/configure
index 99edfb4..25af5fd 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cifs-utils 6.8.
+# Generated by GNU Autoconf 2.69 for cifs-utils 6.9.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cifs-utils'
 PACKAGE_TARNAME='cifs-utils'
-PACKAGE_VERSION='6.8'
-PACKAGE_STRING='cifs-utils 6.8'
+PACKAGE_VERSION='6.9'
+PACKAGE_STRING='cifs-utils 6.9'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils'
 
@@ -630,6 +630,8 @@ CONFIG_PLUGIN_FALSE
 CONFIG_PLUGIN_TRUE
 CONFIG_PAM_FALSE
 CONFIG_PAM_TRUE
+CONFIG_SMBINFO_FALSE
+CONFIG_SMBINFO_TRUE
 CONFIG_CIFSACL_FALSE
 CONFIG_CIFSACL_TRUE
 CONFIG_CIFSIDMAP_FALSE
@@ -759,6 +761,7 @@ enable_cifsupcall
 enable_cifscreds
 enable_cifsidmap
 enable_cifsacl
+enable_smbinfo
 enable_pam
 enable_systemd
 enable_man
@@ -1332,7 +1335,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cifs-utils 6.8 to adapt to many kinds of systems.
+\`configure' configures cifs-utils 6.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1403,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cifs-utils 6.8:";;
+     short | recursive ) echo "Configuration of cifs-utils 6.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,6 +1423,7 @@ Optional Features:
   --enable-cifscreds      Create cifscreds utility [default=yes]
   --enable-cifsidmap      Create cifs.idmap binary [default=yes]
   --enable-cifsacl        Create get/set cifsacl binary [default=yes]
+  --enable-smbinfo        Create smbinfo binary [default=yes@@
   --enable-pam            Create cifscreds PAM module [default=yes]
   --enable-systemd        Enable systemd specific behavior for mount.cifs
                           [default=yes]
@@ -1529,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cifs-utils configure 6.8
+cifs-utils configure 6.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +2002,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cifs-utils $as_me 6.8, which was
+It was created by cifs-utils $as_me 6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2868,7 +2872,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cifs-utils'
- VERSION='6.8'
+ VERSION='6.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3011,6 +3015,14 @@ else
 fi
 
 
+# Check whether --enable-smbinfo was given.
+if test "${enable_smbinfo+set}" = set; then :
+  enableval=$enable_smbinfo; enable_smbinfo=$enableval
+else
+  enable_smbinfo="maybe"
+fi
+
+
 # Check whether --enable-pam was given.
 if test "${enable_pam+set}" = set; then :
   enableval=$enable_pam; enable_pam=$enableval
@@ -6002,8 +6014,10 @@ fi
 
 # if docs are not disabled, check if rst2man is available
 if test $enable_man != "no"; then
-	# Extract the first word of "rst2man", so it can be a program name with args.
-set dummy rst2man; ac_word=$2
+	for ac_prog in rst2man-3.6 rst2man-3.4 rst2man-3 rst2man.py rst2man
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_have_rst2man+:} false; then :
@@ -6019,7 +6033,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_have_rst2man="yes"
+    ac_cv_prog_have_rst2man="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6027,7 +6041,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_have_rst2man" && ac_cv_prog_have_rst2man="no"
 fi
 fi
 have_rst2man=$ac_cv_prog_have_rst2man
@@ -6040,12 +6053,16 @@ $as_echo "no" >&6; }
 fi
 
 
+  test -n "$have_rst2man" && break
+done
+test -n "$have_rst2man" || have_rst2man="no"
+
 	if test $have_rst2man = "no"; then
 		if test $enable_man = "yes"; then
-			as_fn_error $? "rst2man not found: cannot generate man pages, consider installing perl." "$LINENO" 5
+			as_fn_error $? "rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils." "$LINENO" 5
 		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation." >&5
-$as_echo "$as_me: WARNING: rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation." >&2;}
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation." >&5
+$as_echo "$as_me: WARNING: rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation." >&2;}
 			enable_man="no"
 		fi
 	else
@@ -6109,6 +6126,14 @@ else
   CONFIG_CIFSACL_FALSE=
 fi
 
+ if test "$enable_smbinfo" != "no"; then
+  CONFIG_SMBINFO_TRUE=
+  CONFIG_SMBINFO_FALSE='#'
+else
+  CONFIG_SMBINFO_TRUE='#'
+  CONFIG_SMBINFO_FALSE=
+fi
+
  if test "$enable_pam" != "no"; then
   CONFIG_PAM_TRUE=
   CONFIG_PAM_FALSE='#'
@@ -6379,6 +6404,10 @@ if test -z "${CONFIG_CIFSACL_TRUE}" && test -z "${CONFIG_CIFSACL_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_CIFSACL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_SMBINFO_TRUE}" && test -z "${CONFIG_SMBINFO_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_SMBINFO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_PAM_TRUE}" && test -z "${CONFIG_PAM_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_PAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6784,7 +6813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cifs-utils $as_me 6.8, which was
+This file was extended by cifs-utils $as_me 6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6851,7 +6880,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cifs-utils config.status 6.8
+cifs-utils config.status 6.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b0bc2b9..cc48563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([cifs-utils],[6.8],[[e-mail]],[cifs-utils],[https://wiki.samba.org/index.php/LinuxCIFS_utils])
+AC_INIT([cifs-utils],[6.9],[[e-mail]],[cifs-utils],[https://wiki.samba.org/index.php/LinuxCIFS_utils])
 AC_CONFIG_SRCDIR([data_blob.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile contrib/Makefile contrib/request-key.d/Makefile])
@@ -40,6 +40,11 @@ AC_ARG_ENABLE(cifsacl,
 	enable_cifsacl=$enableval,
 	enable_cifsacl="maybe")
 
+AC_ARG_ENABLE(smbinfo,
+        [AS_HELP_STRING([--enable-smbinfo],[Create smbinfo binary @<:@default=yes@@])],
+        enable_smbinfo=$enableval,
+        enable_smbinfo="maybe")
+
 AC_ARG_ENABLE(pam,
 	[AS_HELP_STRING([--enable-pam],[Create cifscreds PAM module @<:@default=yes@:>@])],
 	enable_pam=$enableval,
@@ -252,12 +257,12 @@ fi
 
 # if docs are not disabled, check if rst2man is available
 if test $enable_man != "no"; then
-	AC_CHECK_PROG(have_rst2man, rst2man, yes, no)
+	AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man.py rst2man, no)
 	if test $have_rst2man = "no"; then
 		if test $enable_man = "yes"; then
-			AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.])
+			AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils.])
 		else
-			AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation.])
+			AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation.])
 			enable_man="no"
 		fi
 	else
@@ -275,6 +280,7 @@ AM_CONDITIONAL(CONFIG_CIFSUPCALL, [test "$enable_cifsupcall" != "no"])
 AM_CONDITIONAL(CONFIG_CIFSCREDS, [test "$enable_cifscreds" != "no"])
 AM_CONDITIONAL(CONFIG_CIFSIDMAP, [test "$enable_cifsidmap" != "no"])
 AM_CONDITIONAL(CONFIG_CIFSACL, [test "$enable_cifsacl" != "no"])
+AM_CONDITIONAL(CONFIG_SMBINFO, [test "$enable_smbinfo" != "no"])
 AM_CONDITIONAL(CONFIG_PAM, [test "$enable_pam" != "no"])
 AM_CONDITIONAL(CONFIG_PLUGIN, [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
 
diff --git a/debian/changelog b/debian/changelog
index bb072ea..f769a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cifs-utils (2:6.9-0ubuntu1) eoan; urgency=medium
+
+  * New upstream version: 6.9 (LP: #1831292)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 17 Jun 2019 13:47:42 +0000
+
 cifs-utils (2:6.8-2) unstable; urgency=medium
 
   * Drop Depends: samba-common (Closes: #901654)
diff --git a/debian/control b/debian/control
index 6c156ec..0f3b7bc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: cifs-utils
 Section: otherosfs
 Priority: optional
-Maintainer: Debian Samba Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Samba Maintainers <[e-mail]>
 Uploaders: Steve Langasek <[e-mail]>, Noèl Köthe <[e-mail]>, Jelmer Vernooij <[e-mail]>, Mathieu Parent <[e-mail]>
 Build-Depends: debhelper (>= 11),
 	libkeyutils-dev,
diff --git a/getcifsacl.c b/getcifsacl.c
index f08cdea..fc78881 100644
--- a/getcifsacl.c
+++ b/getcifsacl.c
@@ -40,6 +40,7 @@
 
 static void *plugin_handle;
 static bool plugin_loaded;
+static char *execname;
 
 static void
 print_each_ace_mask(uint32_t mask)
@@ -331,6 +332,8 @@ getcifsacl_usage(const char *prog)
 		prog);
 	fprintf(stderr, "Usage: %s [option] <file_name>\n", prog);
 	fprintf(stderr, "Valid options:\n");
+	fprintf(stderr, "\t-h	Display this help text\n");
+	fprintf(stderr, "\n");
 	fprintf(stderr, "\t-v	Version of the program\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "\t-r	Display raw values of the ACE fields\n");
@@ -345,8 +348,15 @@ main(const int argc, char *const argv[])
 	ssize_t attrlen;
 	size_t bufsize = BUFSIZE;
 	char *filename, *attrval;
+	execname = basename(argv[0]);
 
-	while ((c = getopt_long(argc, argv, "r:v", NULL, NULL)) != -1) {
+	if (argc < 2) {
+		fprintf(stderr, "%s: you must specify a filename.\n", execname);
+		printf("Try `getcifsacl -h' for more information.\n");
+		goto out;
+	}
+
+	while ((c = getopt_long(argc, argv, "rhv", NULL, NULL)) != -1) {
 		switch (c) {
 		case 'v':
 			printf("Version: %s\n", VERSION);
@@ -355,18 +365,17 @@ main(const int argc, char *const argv[])
 			raw = true;
 			break;
 		default:
-			break;
+			getcifsacl_usage(execname);
+			goto out;
 		}
 	}
 
-	if (raw && argc == 3)
-		filename = argv[2];
-	else if (argc == 2)
-		filename = argv[1];
-	else {
-		getcifsacl_usage(basename(argv[0]));
+	if (optind >= argc) {
+		printf("you must specify a filename after options.\n");
+		printf("Usage: getcifsacl [option] <file_name>\n");
 		goto out;
-	}
+	} else
+		filename = argv[optind];
 
 	if (!raw && !plugin_loaded) {
 		ret = init_plugin(&plugin_handle);
@@ -398,8 +407,12 @@ cifsacl:
 			free(attrval);
 			bufsize += BUFSIZE;
 			goto cifsacl;
-		} else
-			printf("getxattr error: %d\n", errno);
+		} else {
+			fprintf(stderr, "getxattr failed on %s: %s\n", filename, strerror(errno) );
+			free(attrval);
+			ret = -1;
+			goto out;
+		}
 	}
 
 	parse_sec_desc((struct cifs_ntsd *)attrval, attrlen, raw);
diff --git a/getcifsacl.rst.in b/getcifsacl.rst.in
index 42af258..21a10cd 100644
--- a/getcifsacl.rst.in
+++ b/getcifsacl.rst.in
@@ -7,80 +7,60 @@ Userspace helper to display an ACL in a security descriptor for Common Internet 
 --------------------------------------------------------------------------------------------------
 :Manual section: 1
 
-
 ********
 SYNOPSIS
 ********
 
-
-getcifsacl [-v|-r] {file system object}
-
+  getcifsacl [-v|-r] {file system object}
 
 ***********
 DESCRIPTION
 ***********
 
-
 This tool is part of the cifs-utils suite.
 
-getcifsacl is a userspace helper program for the Linux CIFS client
+``getcifsacl`` is a userspace helper program for the Linux CIFS client
 file system. It is intended to display a security descriptor including
 ACL for a file system object.
 
 This program uses a plugin to handle the mapping of SIDs to user and
-group names.  \ *@pluginpath@*\  should be a symlink that points to the
+group names. *@pluginpath@* should be a symlink that points to the
 correct plugin to use.
 
 Fields of an ACE such as SID, type, flags, and mask are displayed
-separated by /.  Numeric values of type, flags, and mask are displayed
+separated by /. Numeric values of type, flags, and mask are displayed
 in hexadecimal format.
 
-
 *******
 OPTIONS
 *******
 
+-v
+  Print version number and exit.
 
-
-\ **-v**\ 
- 
- Print version number and exit.
- 
-
-
-\ **-r**\ 
- 
- Display a security descriptor in raw mode. Values such as type and
- flags are displayed in hexadecimal format, a SID is not mapped to a
- name.
- 
-
-
+-r
+  Display a security descriptor in raw mode. Values such as type and
+  flags are displayed in hexadecimal format, a SID is not mapped to a
+  name.
 
 *****
 NOTES
 *****
 
-
 Kernel support for getcifsacl/setcifsacl utilities was initially
 introduced in the 2.6.37 kernel.
 
-
 ********
 SEE ALSO
 ********
 
-
 mount.cifs(8), setcifsacl(1)
 
-
 ******
 AUTHOR
 ******
 
-
 Shirish Pargaonkar wrote the getcifsacl program.
 
 The Linux CIFS Mailing list is the preferred place to ask questions
 regarding these programs.
-
diff --git a/idmapwb.rst.in b/idmapwb.rst.in
index 4d7fd62..c03e4ca 100644
--- a/idmapwb.rst.in
+++ b/idmapwb.rst.in
@@ -7,31 +7,28 @@ winbind ID mapping plugin for cifs-utils
 ----------------------------------------
 :Manual section: 8
 
-
 ***********
 DESCRIPTION
 ***********
 
-
 This plugin allows the utilities in cifs-utils to work in conjuction with
 the winbind facility of Samba suite. It handles several functions including
 mapping UID and GID to SIDs and vice versa.
 
 Utilities are usually configured to use the correct plugin by creating a
-symlink at @pluginpath@ that points to the correct plugin that you wish
+symlink at *@pluginpath@* that points to the correct plugin that you wish
 to use.
 
-This plugin requires that \ **winbindd(8)**\  be properly configured and running.
+This plugin requires that winbindd(8) be properly configured and running.
 
-
-*******************************************************************************
+********
 SEE ALSO
-*******************************************************************************
-getcifsacl(1), setcifsacl(1), cifs.idmap(8), samba(7), smb.conf(5), winbindd(8)
-
+********
 
+getcifsacl(1), setcifsacl(1), cifs.idmap(8), samba(7), smb.conf(5), winbindd(8)
 
-*****************************************************************
+******
 AUTHOR
-*****************************************************************
+******
+
 idmapwb.so was written by Jeff Layton <[e-mail]>
diff --git a/mount.cifs.c b/mount.cifs.c
index ae7a899..b3235e4 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -43,6 +43,7 @@
 #include <limits.h>
 #include <paths.h>
 #include <libgen.h>
+#include <time.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #ifdef HAVE_SYS_FSUID_H
@@ -161,10 +162,16 @@
 #define OPT_BKUPUID    30
 #define OPT_BKUPGID    31
 #define OPT_NOFAIL     32
+#define OPT_SNAPSHOT   33
 
 #define MNT_TMP_FILE "/.mtab.cifs.XXXXXX"
 
-/* struct for holding parsed mount info for use by privleged process */
+#define GMT_NAME_LEN 24 /* length of a @GMT- name */
+#define GMT_FORMAT "@GMT-%Y.%m.%d-%H.%M.%S"
+
+#define NTFS_TIME_OFFSET ((unsigned long long)(369*365 + 89) * 24 * 3600 * 10000000)
+
+/* struct for holding parsed mount info for use by privileged process */
 struct parsed_mount_info {
 	unsigned long flags;
 	char host[NI_MAXHOST + 1];
@@ -267,22 +274,32 @@ static int mount_usage(FILE * stream)
 	fprintf(stream,
 		"\n\tsep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,serverino,");
 	fprintf(stream,
-		"\n\tmapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+		"\n\tnoserverino,mapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+	fprintf(stream,
+		"\n\tcache=<strict|none|loose>,nounix,cifsacl,sec=<authentication mechanism>,");
+	fprintf(stream,
+		"\n\tsign,seal,fsc,snapshot=<token|time>,nosharesock,persistenthandles,");
 	fprintf(stream,
-		"\n\tdirectio,nounix,cifsacl,sec=<authentication mechanism>,sign,seal,fsc");
+		"\n\tresilienthandles,rdma,vers=<smb_dialect>,cruid");
 	fprintf(stream,
 		"\n\nOptions not needed for servers supporting CIFS Unix extensions");
 	fprintf(stream,
 		"\n\t(e.g. unneeded for mounts to most Samba versions):");
 	fprintf(stream,
-		"\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>,sfu");
+		"\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>,sfu,");
+	fprintf(stream,
+		"\n\tmfsymlinks,idsfromsid");
 	fprintf(stream, "\n\nRarely used options:");
 	fprintf(stream,
 		"\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,");
 	fprintf(stream,
 		"\n\tdev,nodev,nouser_xattr,netbiosname=<OUR_RFC1001NAME>,hard,soft,intr,");
 	fprintf(stream,
-		"\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=<path>,nobrl");
+		"\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=<path>,nobrl,");
+	fprintf(stream,
+		"\n\techo_interval=<seconds>,actimeo=<seconds>,max_credits=<credits>,");
+	fprintf(stream,
+		"\n\tbsize=<size>");
 	fprintf(stream,
 		"\n\nOptions are described in more detail in the manual page");
 	fprintf(stream, "\n\tman 8 mount.cifs\n");
@@ -763,6 +780,8 @@ static int parse_opt_token(const char *token)
 		return OPT_NOFAIL;
 	if (strncmp(token, "x-", 2) == 0)
 		return OPT_IGNORE;
+	if (strncmp(token, "snapshot", 8) == 0)
+		return OPT_SNAPSHOT;
 
 	return OPT_ERROR;
 }
@@ -783,16 +802,19 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
 	int got_uid = 0;
 	int got_cruid = 0;
 	int got_gid = 0;
+	int got_snapshot = 0;
 	uid_t uid, cruid = 0, bkupuid = 0;
 	gid_t gid, bkupgid = 0;
 	char *ep;
 	struct passwd *pw;
 	struct group *gr;
 	/*
-	 * max 32-bit uint in decimal is 4294967295 which is 10 chars wide
-	 * +1 for NULL, and +1 for good measure
+	 * max 64-bit uint in decimal is 18446744073709551615 which is 20 chars
+	 * wide +1 for NULL, and +1 for good measure
 	 */
-	char txtbuf[12];
+	char txtbuf[22];
+	unsigned long long snapshot;
+	struct tm tm;
 
 	/* make sure we're starting from beginning */
 	out[0] = '\0';
@@ -1120,6 +1142,19 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
 		case OPT_NOFAIL:
 			parsed_info->nofail = 1;
 			goto nocopy;
+		case OPT_SNAPSHOT:
+			if (!value || !*value)
+				goto nocopy;
+			if (strncmp(value, "@GMT-", 5))
+				break;
+			if ((strlen(value) != GMT_NAME_LEN) ||
+			    (strptime(value, GMT_FORMAT, &tm) == NULL)) {
+				fprintf(stderr, "bad snapshot token\n");
+				return EX_USAGE;
+			}
+			snapshot = timegm(&tm) * 10000000 + NTFS_TIME_OFFSET;
+			got_snapshot = 1;
+			goto nocopy;
 		}
 
 		/* check size before copying option to buffer */
@@ -1215,7 +1250,7 @@ nocopy:
 	if (got_bkupgid) {
 		word_len = snprintf(txtbuf, sizeof(txtbuf), "%u", bkupgid);
 
-		/* comma + "backkupgid=" + terminating NULL == 12 */
+		/* comma + "backupgid=" + terminating NULL == 12 */
 		if (out_len + word_len + 12 > MAX_OPTIONS_LEN) {
 			fprintf(stderr, "Options string too long\n");
 			return EX_USAGE;
@@ -1227,6 +1262,21 @@ nocopy:
 		}
 		snprintf(out + out_len, word_len + 11, "backupgid=%s", txtbuf);
 	}
+	if (got_snapshot) {
+		word_len = snprintf(txtbuf, sizeof(txtbuf), "%llu", snapshot);
+
+		/* comma + "snapshot=" + terminating NULL == 11 */
+		if (out_len + word_len + 11 > MAX_OPTIONS_LEN) {
+			fprintf(stderr, "Options string too long\n");
+			return EX_USAGE;
+		}
+
+		if (out_len) {
+			strlcat(out, ",", MAX_OPTIONS_LEN);
+			out_len++;
+		}
+		snprintf(out + out_len, word_len + 11, "snapshot=%s", txtbuf);
+	}
 
 	return 0;
 }
@@ -2099,6 +2149,10 @@ mount_retry:
 		switch (errno) {
 		case ECONNREFUSED:
 		case EHOSTUNREACH:
+			if (currentaddress) {
+				fprintf(stderr, "mount error(%d): could not connect to %s",
+					errno, currentaddress);
+			}
 			currentaddress = nextaddress;
 			if (currentaddress) {
 				nextaddress = strchr(currentaddress, ',');
@@ -2110,6 +2164,12 @@ mount_retry:
 			fprintf(stderr,
 				"mount error: %s filesystem not supported by the system\n", cifs_fstype);
 			break;
+		case EHOSTDOWN:
+			fprintf(stderr,
+				"mount error: Server abruptly closed the connection.\n"
+				"This can happen if the server does not support the SMB version you are trying to use.\n"
+				"The default SMB version recently changed from SMB1 to SMB2.1 and above. Try mounting with vers=1.0.\n");
+			break;
 		case ENXIO:
 			if (!already_uppercased &&
 			    uppercase_string(parsed_info->host) &&
@@ -2126,7 +2186,7 @@ mount_retry:
 			strerror(errno));
 		fprintf(stderr,
 			"Refer to the %s(8) manual page (e.g. man "
-			"%s)\n", thisprogram, thisprogram);
+			"%s) and kernel log messages (dmesg)\n", thisprogram, thisprogram);
 		rc = EX_FAIL;
 		goto mount_exit;
 	}
diff --git a/mount.cifs.rst b/mount.cifs.rst
index a81c6c4..ee5086c 100644
--- a/mount.cifs.rst
+++ b/mount.cifs.rst
@@ -15,13 +15,13 @@ SYNOPSIS
 
 This tool is part of the cifs-utils suite.
 
-``mount.cifs`` mounts a Linux CIFS filesystem. It is usually invoked
-indirectly by the mount(8) command when using the "-t cifs"
+``mount.cifs`` mounts a CIFS or SMB3 filesystem from Linux. It is
+usually invoked indirectly by the mount(8) command when using the "-t cifs"
 option. This command only works in Linux, and the kernel must support
-the cifs filesystem. The CIFS protocol is the successor to the SMB
-protocol and is supported by most Windows servers and many other
-commercial servers and Network Attached Storage appliances as well as
-by the popular Open Source server Samba.
+the cifs filesystem. The SMB3 protocol is the successor to the CIFS (SMB)
+protocol and is supported by most Windows servers, Azure (cloud storage),
+Macs and many other commercial servers and Network Attached Storage
+appliances as well as by the popular Open Source server Samba.
 
 The mount.cifs utility attaches the UNC name (exported network
 resource) specified as service (using ``//server/share`` syntax, where
@@ -47,7 +47,6 @@ unmounted (usually via the ``umount`` utility).
 OPTIONS
 *******
 
-
 username=arg|user=arg
   specifies the username to connect as. If this is not
   given, then the environment variable USER is used.
@@ -84,9 +83,9 @@ credentials=filename|cred=filename
    password=value
    domain=value
 
- This is preferred over having passwords in plaintext in a shared file,
- such as ``/etc/fstab`` . Be sure to protect any credentials file
- properly.
+  This is preferred over having passwords in plaintext in a shared file,
+  such as */etc/fstab* . Be sure to protect any credentials file
+  properly.
 
 uid=arg
   sets the uid that will own all files or directories on the mounted
@@ -124,6 +123,11 @@ forcegid
   of the gid= option. See the section on `FILE AND DIRECTORY OWNERSHIP
   AND PERMISSIONS`_ below for more information.
 
+idsfromsid
+  Extract uid/gid from special SID instead of mapping it. See the
+  section on `FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS`_ below for
+  more information.
+
 port=arg
   sets the port number on which the client will attempt to contact the
   CIFS server. If this value is specified, look for an existing
@@ -134,23 +138,20 @@ port=arg
   try to connect on port 445 first and then port 139 if that
   fails. Return an error if both fail.
 
-servernetbiosname=arg
-  Specify the server netbios name (RFC1001 name) to use when attempting
-  to setup a session to the server. Although rarely needed for mounting
+netbiosname=arg
+  When mounting to servers via port 139, specifies the RFC1001 source
+  name to use to represent the client netbios machine during the netbios
+  session initialization.
+
+servern=arg
+  Similar to ``netbiosname`` except it specifies the netbios name of
+  the server instead of the client. Although rarely needed for mounting
   to newer servers, this option is needed for mounting to some older
   servers (such as OS/2 or Windows 98 and Windows ME) since when
   connecting over port 139 they, unlike most newer servers, do not
   support a default server name. A server name can be up to 15
   characters long and is usually uppercased.
 
-servern=arg
-  Synonym for ``servernetbiosname``
-
-netbiosname=arg
-  When mounting to servers via port 139, specifies the RFC1001 source
-  name to use to represent the client netbios machine name when doing
-  the RFC1001 netbios session initialize.
-
 file_mode=arg
   If the server does not support the CIFS Unix extensions this overrides
   the default file mode.
@@ -165,7 +166,14 @@ ip=arg|addr=arg
   rarely needs to be specified by the user.
 
 domain=arg|dom=arg|workgroup=arg
-  sets the domain (workgroup) of the user.
+  Sets the domain (workgroup) of the user. If no domains are given,
+  the empty domain will be used. Use ``domainauto`` to automatically
+  guess the domain of the server you are connecting to.
+
+domainauto
+  When using NTLM authentication and not providing a domain via
+  ``domain``, guess the domain from the server NTLM challenge.
+  This behavior used to be the default on kernels older than 2.6.36.
 
 guest
   don't prompt for a password.
@@ -238,31 +246,32 @@ cache=arg
   The default in kernels prior to 3.7 was ``loose``. As of kernel 3.7 the
   default is ``strict``.
 
-directio
-  Do not do inode data caching on files opened on this mount. This
-  precludes mmaping files on this mount. In some cases with fast
-  networks and little or no caching benefits on the client (e.g. when
-  the application is doing large sequential reads bigger than page size
-  without rereading the same data) this can provide better performance
-  than the default behavior which caches reads (readahead) and writes
-  (writebehind) through the local Linux client pagecache if oplock
-  (caching token) is granted and held. Note that direct allows write
-  operations larger than page size to be sent to the server. On some
-  kernels this requires the cifs.ko module to be built with the
-  ``CIFS_EXPERIMENTAL`` configure option.
-
-  This option is will be deprecated in 3.7. Users should use
-  ``cache=none`` instead on more recent kernels.
-
-strictcache
-  Use for switching on strict cache mode. In this mode the client reads
-  from the cache all the time it has *Oplock Level II* , otherwise -
-  read from the server. As for write - the client stores a data in the
-  cache in *Exclusive Oplock* case, otherwise - write directly to the
-  server.
-
-  This option is will be deprecated in 3.7. Users should use
-  ``cache=strict`` instead on more recent kernels.
+nostrictsync
+  Do not ask the server to flush on fsync().
+  Some servers perform non-buffered writes by default in which case
+  flushing is redundant. In workloads where a client is performing a
+  lot of small write + fsync combinations and where network latency is
+  much higher than the server latency, this brings a 2x performance
+  improvement.
+  This option is also a good candidate in scenarios where we want
+  performance over consistency.
+
+handlecache
+  (default) In SMB2 and above, the client often has to open the root
+  of the share (empty path) in various places during mount, path
+  revalidation and the statfs(2) system call. This option cuts
+  redundant round trip traffic (opens and closes) by simply keeping
+  the directory handle for the root around once opened.
+
+nohandlecache
+  Disable caching of the share root directory handle.
+
+handletimeout=arg
+  The time (in milliseconds) for which the server should reserve the handle after
+  a failover waiting for the client to reconnect.  When mounting with
+  resilienthandles or persistenthandles mount option, or when their use is
+  requested by the server (continuous availability shares) then this parameter
+  overrides the server default handle timeout (which for most servers is 120 seconds).
 
 rwpidforward
   Forward pid of a process who opened a file to any read or write
@@ -274,7 +283,7 @@ mapchars
   including the colon, question mark, pipe, asterik, greater than and
   less than characters) to the remap range (above 0xF000), which also
   allows the CIFS client to recognize files created with such characters
-  by Windows's POSIX emulation. This can also be useful when mounting to
+  by Windows's Services for Mac. This can also be useful when mounting to
   most versions of Samba (which also forbids creating and opening files
   whose names contain any of these seven characters). This has no effect
   if the server does not support Unicode on the wire. Please note that
@@ -284,6 +293,10 @@ mapchars
 nomapchars
   (default) Do not translate any of these seven characters.
 
+mapposix
+  Translate reserved characters similarly to ``mapchars`` but use the
+  mapping from Microsoft "Services For Unix".
+
 intr
   currently unimplemented.
 
@@ -358,8 +371,35 @@ sec=arg
   automatically if it's enabled in */proc/fs/cifs/SecurityFlags*.
 
 seal
-  Request encryption at the SMB layer. Encryption is only supported in
-  SMBv3 and above. The encryption algorithm used is AES-128-CCM.
+  Request encryption at the SMB layer. The encryption algorithm used
+  is AES-128-CCM. Requires SMB3 or above (see ``vers``).
+
+rdma
+  Connect directly to the server using SMB Direct via a RDMA
+  adapter. Requires SMB3 or above (see ``vers``).
+
+resilienthandles
+  Enable resilient handles. If the server supports it, keep opened
+  files across reconnections. Requires SMB2.1 (see ``vers``).
+
+noresilienthandles
+  (default) Disable resilient handles.
+
+persistenthandles
+  Enable persistent handles. If the server supports it, keep opened
+  files across reconnections. Persistent handles are also valid across
+  servers in a cluster and have stronger guarantees than resilient
+  handles. Requires SMB3 or above (see ``vers``).
+
+nopersistenthandles
+  (default) Disable persistent handles.
+
+snapshot=time
+   Mount a specific snapshot of the remote share. ``time`` must be a
+   positive integer identifying the snapshot requested (in 100-nanosecond
+   units that have elapsed since January 1, 1601, or alternatively it can
+   be specified in GMT format e.g. @GMT-2019.03.27-20.52.19). Supported
+   in the Linux kernel starting from v4.19.
 
 nobrl
   Do not send byte range lock requests to the server. This is necessary
@@ -367,8 +407,15 @@ nobrl
   range locks (and most cifs servers do not yet support requesting
   advisory byte range locks).
 
+forcemandatorylock
+  Do not use POSIX locks even when available via unix
+  extensions. Always use cifs style mandatory locks.
+
+locallease
+  Check cached leases locally instead of querying the server.
+
 sfu
-  When the CIFS Unix Extensions are not negotiated, attempt to create
+  When the CIFS or SMB3 Unix Extensions are not negotiated, attempt to create
   device files and fifos in a format compatible with Services for Unix
   (SFU). In addition retrieve bits 10-12 of the mode via the
   ``SETFILEBITS`` extended attribute (as SFU does). In the future the
@@ -417,8 +464,12 @@ noserverino
 
   See section `INODE NUMBERS`_ for more information.
 
-nounix
-  Disable the CIFS Unix Extensions for this mount. This can be useful in
+posix|unix|linux
+  (default) Enable Unix Extensions for this mount. Requires CIFS
+  (vers=1.0) or SMB3.1.1 (vers=3.1.1) and a server supporting them.
+
+noposix|nounix|nolinux
+  Disable the Unix Extensions for this mount. This can be useful in
   order to turn off multiple settings at once. This includes POSIX acls,
   POSIX locks, POSIX paths, symlink support and retrieving
   uids/gids/mode from the server. This can also be useful to work around
@@ -430,33 +481,51 @@ nouser_xattr
   Do not allow getfattr/setfattr to get/set xattrs, even if server would
   support it otherwise. The default is for xattr support to be enabled.
 
+nodfs
+  Do not follow Distributed FileSystem referrals. IO on a file not
+  stored on the server will fail instead of connecting to the target
+  server transparently.
+
+noautotune
+  Use fixed size for kernel recv/send socket buffers.
+
+nosharesock
+  Do not try to reuse sockets if the system is already connected to
+  the server via an existing mount point. This will make the client
+  always make a new connection to the server no matter what he is
+  already connected to. This can be useful in simulating multiple
+  clients connecting to the same server, as each mount point
+  will use a different TCP socket.
+
+noblocksend
+  Send data on the socket using non blocking operations (MSG_DONTWAIT flag).
+
 rsize=bytes
   Maximum amount of data that the kernel will request in a read request
-  in bytes. Prior to kernel 3.2.0, the default was 16k, and the maximum
-  size was limited by the ``CIFSMaxBufSize`` module parameter. As of
-  kernel 3.2.0, the behavior varies according to whether POSIX
-  extensions are enabled on the mount and the server supports large
-  POSIX reads. If they are, then the default is 1M, and the maximum is
-  16M. If they are not supported by the server, then the default is 60k
-  and the maximum is around 127k. The reason for the 60k is because it's
-  the maximum size read that windows servers can fill. Note that this
-  value is a maximum, and the client may settle on a smaller size to
-  accommodate what the server supports. In kernels prior to 3.2.0, no
-  negotiation is performed.
+  in bytes. Maximum size that servers will accept is typically 8MB for SMB3
+  or later dialects. Default requested during mount is 4MB. Prior to the 4.20
+  kernel the default requested was 1MB. Prior to the SMB2.1 dialect the
+  maximum was usually 64K.
 
 wsize=bytes
   Maximum amount of data that the kernel will send in a write request in
-  bytes. Prior to kernel 3.0.0, the default and maximum was 57344 (14 \*
-  4096 pages). As of 3.0.0, the default depends on whether the client
-  and server negotiate large writes via POSIX extensions. If they do,
-  then the default is 1M, and the maximum allowed is 16M. If they do
-  not, then the default is 65536 and the maximum allowed is 131007. Note
-  that this value is just a starting point for negotiation in 3.0.0 and
-  up. The client and server may negotiate this size downward according
-  to the server's capabilities. In kernels prior to 3.0.0, no
-  negotiation is performed. It can end up with an existing superblock if
-  this value isn't specified or it's greater or equal than the existing
-  one.
+  bytes. Maximum size that servers will accept is typically 8MB for SMB3
+  or later dialects. Default requested during mount is 4MB. Prior to the 4.20
+  kernel the default requested was 1MB. Prior to the SMB2.1 dialect the
+  maximum was usually 64K.
+
+bsize=bytes
+  Override the default blocksize (1MB) reported on SMB3 files (requires
+  kernel version of 5.1 or later). Prior to kernel version 5.1, the
+  blocksize was always reported as 16K instead of 1MB (and was not
+  configurable) which can hurt the performance of tools like cp and scp
+  (especially for uncached I/O) which decide on the read and write size
+  to use for file copies based on the inode blocksize. bsize may not be
+  less than 16K or greater than 16M.
+
+max_credits=n
+  Maximum credits the SMB2 client can have. Default is 32000. Must be
+  set to a number between 20 and 60000.
 
 fsc
   Enable local disk caching using FS-Cache for CIFS. This option could
@@ -533,7 +602,13 @@ vers=arg
     different dialect (2.000) that is not supported.
   - 2.1 - The SMBv2.1 protocol that was introduced in Microsoft Windows 7 and Windows Server 2008R2.
   - 3.0 - The SMBv3.0 protocol that was introduced in Microsoft Windows 8 and Windows Server 2012.
-  - 3.1.1 or 3.11 - The SMBv3.1.1 protocol that was introduced in Microsoft Windows Server 2016.
+  - 3.02 or 3.0.2 - The SMBv3.0.2 protocol that was introduced in Microsoft Windows 8.1 and Windows Server 2012R2.
+  - 3.1.1 or 3.11 - The SMBv3.1.1 protocol that was introduced in Microsoft Windows 10 and Windows Server 2016.
+  - 3 - The SMBv3.0 protocol version and above.
+  - default - Tries to negotiate the highest SMB2+ version supported by both the client and server.
+
+  If no dialect is specified on mount vers=default is used.
+  To check ``Dialect`` refer to /proc/fs/cifs/DebugData
 
   Note too that while this option governs the protocol version used, not
   all features of each version are available.
@@ -558,7 +633,7 @@ It's generally preferred to use forward slashes (/) as a delimiter in
 service names. They are considered to be the "universal delimiter"
 since they are generally not allowed to be embedded within path
 components on Windows machines and the client can convert them to
-backslashes (\) unconditionally. Conversely, backslash characters are
+backslashes (\\) unconditionally. Conversely, backslash characters are
 allowed by POSIX to be part of a path component, and can't be
 automatically converted in the same way.
 
@@ -821,14 +896,26 @@ CONFIGURATION
 The primary mechanism for making configuration changes and for reading
 debug information for the cifs vfs is via the Linux /proc
 filesystem. In the directory */proc/fs/cifs* are various
-configuration files and pseudo files which can display debug
-information. There are additional startup options such as maximum
-buffer size and number of buffers which only may be set when the
+configuration files and pseudo files which can display debug information
+and performance statistics. There are additional startup options such as
+maximum buffer size and number of buffers which only may be set when the
 kernel cifs vfs (cifs.ko module) is loaded. These can be seen by
 running the ``modinfo`` utility against the file cifs.ko which will
 list the options that may be passed to cifs during module installation
 (device driver load). For more information see the kernel file
-*fs/cifs/README*.
+*fs/cifs/README*. When configuring dynamic tracing (trace-cmd)
+note that the list of SMB3 events which can be enabled can be seen at:
+*/sys/kernel/debug/tracing/events/cifs/*.
+
+********
+SECURITY
+********
+
+The use of SMB2.1 or later (including the latest dialect SMB3.1.1)
+is recommended for improved security and SMB1 is no longer requested
+by default at mount time. Old dialects such as CIFS (SMB1, ie vers=1.0)
+have much weaker security. Use of CIFS (SMB1) can be disabled by
+modprobe cifs disable_legacy_dialects=y.
 
 ****
 BUGS
@@ -849,8 +936,8 @@ bugs (minimum: mount.cifs (try ``mount.cifs -V``), kernel (see
 VERSION
 *******
 
-This man page is correct for version 1.74 of the cifs vfs filesystem
-(roughly Linux kernel 3.0).
+This man page is correct for version 2.18 of the cifs vfs filesystem
+(roughly Linux kernel 5.0).
 
 ********
 SEE ALSO
@@ -868,6 +955,6 @@ AUTHOR
 
 Steve French
 
-The maintainer of the Linux cifs vfs and the userspace tool mount.cifs
-is Steve French. The Linux CIFS Mailing list is the preferred place to
-ask questions regarding these programs.
+The maintainer of the Linux cifs vfs is Steve French. The maintainer of the
+cifs-utils suite of user space tools is Pavel Shilovsky. The Linux CIFS Mailing
+list is the preferred place to ask questions regarding these programs.
diff --git a/pam_cifscreds.rst b/pam_cifscreds.rst
index 8e8308c..4e89bfd 100644
--- a/pam_cifscreds.rst
+++ b/pam_cifscreds.rst
@@ -7,110 +7,83 @@ PAM module to manage NTLM credentials in kernel keyring
 -------------------------------------------------------
 :Manual section: 8
 
-
 ********
 SYNOPSIS
 ********
 
-
 Edit the PAM configuration files for the systems that you want to
-automatically register NTLM credentials for, e.g. /etc/pam.d/login,
-and modify as follows:
-
-
-.. code-block:: perl
+automatically register NTLM credentials for, e.g. */etc/pam.d/login*,
+and modify as follows::
 
          ...
          auth       substack     system-auth
      +++ auth       optional     pam_cifscreds.so
          auth       include      postlogin
          ...
- 
+
          ...
          session    include      system-auth
      +++ session    optional     pam_cifscreds.so domain=DOMAIN
          session    include      postlogin
          ...
 
-
 Change DOMAIN to the name of you Windows domain, or use host= as
 described below.
 
-
 ***********
 DESCRIPTION
 ***********
 
-
-The \ **pam_cifscreds**\  PAM module is a tool for automatically adding
+The ``pam_cifscreds`` PAM module is a tool for automatically adding
 credentials (username and password) for the purpose of establishing
 sessions in multiuser mounts.
 
 When a cifs filesystem is mounted with the "multiuser" option, and does
 not use krb5 authentication, it needs to be able to get the credentials
-for each user from somewhere. The \ **pam_cifscreds**\  module can be used
+for each user from somewhere. The ``pam_cifscreds`` module can be used
 to provide these credentials to the kernel automatically at login.
 
 In the session section of the PAM configuration file, the module can
 either an NT domain name or a list of hostname or addresses.
 
-
 *******
 OPTIONS
 *******
 
+``pam_cifscreds`` supports a couple options which can be set in the PAM
+configuration files. You must have one (and only one) of ``domain=`` or
+``host=``.
 
-\ **pam_cifscreds**\  supports a couple options which can be set in the PAM
-configuration files.  You must have one (and only one) of domain= or
-host=.
-
-
-\ **debug**\ 
- 
- Turns on some extra debug logging.
- 
-
-
-\ **domain**\ =<NT domain name>
- 
- Credentials will be added for the specified NT domain name.
- 
-
-
-\ **host**\ =<hostname or IP address>[,...]
- 
- Credentials will be added for the specified hostnames or IP addresses.
- 
+debug
+  Turns on some extra debug logging.
 
+domain=<NT domain name>
+  Credentials will be added for the specified NT domain name.
 
+host=<hostname or IP address>[,...]
+  Credentials will be added for the specified hostnames or IP addresses.
 
 *****
 NOTES
 *****
 
-
 The pam_cifscreds PAM module requires a kernel built with support for
-the \ **login**\  key type. That key type was added in v3.3 in mainline Linux
+the ``login`` key type. That key type was added in v3.3 in mainline Linux
 kernels.
 
-Since \ **pam_cifscreds**\  adds keys to the session keyring, it is highly
-recommended that one use \ **pam_keyinit**\  to ensure that a session keyring
+Since ``pam_cifscreds`` adds keys to the session keyring, it is highly
+recommended that one use ``pam_keyinit`` to ensure that a session keyring
 is established at login time.
 
-
 ********
 SEE ALSO
 ********
 
-
 cifscreds(1), pam_keyinit(8)
 
-
 ******
 AUTHOR
 ******
 
-
 The pam_cifscreds PAM module was developed by Orion Poplawski
 <[e-mail]>.
-
diff --git a/setcifsacl.c b/setcifsacl.c
index ba34403..1b98c37 100644
--- a/setcifsacl.c
+++ b/setcifsacl.c
@@ -106,13 +106,32 @@ copy_sec_desc(const struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
 
 	/* copy owner sid */
 	owner_sid_ptr = (struct cifs_sid *)((char *)pntsd + osidsoffset);
-	nowner_sid_ptr = (struct cifs_sid *)((char *)pnntsd + osidsoffset);
-	size = copy_cifs_sid(nowner_sid_ptr, owner_sid_ptr);
-	bufsize += size;
+	group_sid_ptr = (struct cifs_sid *)((char *)pntsd + gsidsoffset);
+	/*
+	 * some servers like Azure return the owner and group SIDs at end rather
+	 * than at the beginning of the ACL so don't want to overwrite the last ACEs
+         */
+	if (dacloffset <= osidsoffset) {
+		/* owners placed at end of ACL */
+		nowner_sid_ptr = (struct cifs_sid *)((char *)pnntsd + dacloffset + size);
+		pnntsd->osidoffset = dacloffset + size;
+		size = copy_cifs_sid(nowner_sid_ptr, owner_sid_ptr);
+		bufsize += size;
+		/* put group SID after owner SID */
+		ngroup_sid_ptr = (struct cifs_sid *)((char *)nowner_sid_ptr + size);
+		pnntsd->gsidoffset = pnntsd->osidoffset + size;
+	} else {
+		/*
+		 * Most servers put the owner information at the beginning,
+		 * before the ACL
+		 */
+		nowner_sid_ptr = (struct cifs_sid *)((char *)pnntsd + osidsoffset);
+		size = copy_cifs_sid(nowner_sid_ptr, owner_sid_ptr);
+		bufsize += size;
+		ngroup_sid_ptr = (struct cifs_sid *)((char *)pnntsd + gsidsoffset);
+	}
 
 	/* copy group sid */
-	group_sid_ptr = (struct cifs_sid *)((char *)pntsd + gsidsoffset);
-	ngroup_sid_ptr = (struct cifs_sid *)((char *)pnntsd + gsidsoffset);
 	size = copy_cifs_sid(ngroup_sid_ptr, group_sid_ptr);
 	bufsize += size;
 
diff --git a/setcifsacl.rst.in b/setcifsacl.rst.in
index ea981e2..de9c758 100644
--- a/setcifsacl.rst.in
+++ b/setcifsacl.rst.in
@@ -7,179 +7,110 @@ Userspace helper to alter an ACL in a security descriptor for Common Internet Fi
 ------------------------------------------------------------------------------------------------
 :Manual section: 1
 
-
 ********
 SYNOPSIS
 ********
 
-
-setcifsacl [-v|-a|-D|-M|-S] "{one or more ACEs}" {file system object}
-
+  setcifsacl [-v|-a|-D|-M|-S] "{one or more ACEs}" {file system object}
 
 ***********
 DESCRIPTION
 ***********
 
-
 This tool is part of the cifs-utils suite.
 
-\ **setcifsacl**\  is a userspace helper program for the Linux CIFS client
-file system.  It is intended to alter an ACL of a security descriptor
-for a file system object.  Whether a security descriptor to be set is
+``setcifsacl`` is a userspace helper program for the Linux CIFS client
+file system. It is intended to alter an ACL of a security descriptor
+for a file system object. Whether a security descriptor to be set is
 applied or not is determined by the CIFS/SMB server.
 
 This program uses a plugin to handle the mapping of user and group
-names to SIDs.  ``@pluginpath@``  should be a symlink that points to the
+names to SIDs. *@pluginpath@* should be a symlink that points to the
 correct plugin to use.
 
-
 *******
 OPTIONS
 *******
 
+-h
+  Print usage message and exit.
 
+-v
+  Print version number and exit.
 
-\ **-h**\ 
- 
- Print usage message and exit.
- 
-
-
-\ **-v**\ 
- 
- Print version number and exit.
- 
+-a
+  Add one or more ACEs to an ACL of a security descriptor.  An ACE is
+  added even if the same ACE exists in the ACL.
 
+-D
+ Delete one or more ACEs from an ACL of a security descriptor.  Entire
+ ACE has to match in an existing ACL for the listed ACEs to be deleted.
 
-\ **-a**\ 
- 
- Add one or more ACEs to an ACL of a security descriptor.  An ACE is
- added even if the same ACE exists in the ACL.
- 
+-M
+  Modify one or more ACEs from an ACL of a security descriptor.  SID and
+  type are used to match for existing ACEs to be modified with the list
+  of ACEs specified.
 
+-S
+  Set an ACL of security descriptor with the list of ACEs Existing ACL
+  is replaced entirely with the specified ACEs.
 
-\ **-D**\ 
- 
- Delete one or more ACEs from an ACL of a security descriptor.  Entire
- ACE has to match in an existing ACL for the listed ACEs to be deleted.
- 
-
-
-\ **-M**\ 
- 
- Modify one or more ACEs from an ACL of a security descriptor.  SID and
- type are used to match for existing ACEs to be modified with the list
- of ACEs specified.
- 
-
-
-\ **-S**\ 
- 
- Set an ACL of security descriptor with the list of ACEs Existing ACL
- is replaced entirely with the specified ACEs.
- 
- Every ACE entry starts with "ACL:" One or more ACEs are specified
- within double quotes.  Multiple ACEs are separated by a comma.
- 
- Following fields of an ACE can be modified with possible values:
- 
- 
- \ **SID**\  - Either a name or a raw SID value.
- 
- 
- 
- \ **type**\  - ALLOWED (0x0), DENIED (0x1), OBJECT_ALLOWED (0x5), OBJECT_DENIED (0x6)
- 
- 
- 
- \ **flags**\  - OBJECT_INHERIT_FLAG (OI or 0x1), CONTAINER_INHERIT_FLAG (CI or 0x2), NO_PROPAGATE_INHERIT_FLAG (NI or
- 0x4), INHERIT_ONLY_FLAG (IO or 0x8), INHERITED_ACE_FLAG (IA or 0x10)
- or a combination/OR of these values.
- 
- 
- 
- \ **mask**\  - Either one of FULL, CHANGE, READ, a combination of R W X D P O, or a hex value
- 
- 
- 
+  Every ACE entry starts with "ACL:" One or more ACEs are specified
+  within double quotes.  Multiple ACEs are separated by a comma.
 
+  Following fields of an ACE can be modified with possible values:
 
+  - ``SID`` - Either a name or a raw SID value.
+  - ``type`` - ALLOWED (0x0), DENIED (0x1), OBJECT_ALLOWED (0x5), OBJECT_DENIED (0x6)
+  - ``flags`` - OBJECT_INHERIT_FLAG (OI or 0x1),
+    CONTAINER_INHERIT_FLAG (CI or 0x2), NO_PROPAGATE_INHERIT_FLAG (NI
+    or 0x4), INHERIT_ONLY_FLAG (IO or 0x8), INHERITED_ACE_FLAG (IA or
+    0x10) or a combination/OR of these values.
+  - ``mask``  - Either one of FULL, CHANGE, READ, a combination of R W X D P O, or a hex value.
 
 ********
 EXAMPLES
 ********
 
-
 Add an ACE
 ==========
 
-
-
-.. code-block:: perl
-
-        setcifsacl -a "ACL:CIFSTESTDOM\user2:DENIED/0x1/D" <file_name>
-        setcifsacl -a "ACL:CIFSTESTDOM\user1:ALLOWED/OI|CI|NI/D" <file_name>
-
-
+  setcifsacl -a "ACL:CIFSTESTDOM\user2:DENIED/0x1/D" <file_name>
+  setcifsacl -a "ACL:CIFSTESTDOM\user1:ALLOWED/OI|CI|NI/D" <file_name>
 
 Delete an ACE
 =============
 
-
-
-.. code-block:: perl
-
-        setcifsacl -D "ACL:S-1-1-0:0x1/OI/0x1201ff" <file_name>
-
-
+  setcifsacl -D "ACL:S-1-1-0:0x1/OI/0x1201ff" <file_name>
 
 Modify an ACE
 =============
 
-
-
-.. code-block:: perl
-
-        setcifsacl -M "ACL:CIFSTESTDOM\user1:ALLOWED/0x1f/CHANGE" <file_name>
-
-
+  setcifsacl -M "ACL:CIFSTESTDOM\user1:ALLOWED/0x1f/CHANGE" <file_name>
 
 Set an ACL
 ==========
 
-
-
-.. code-block:: perl
-
-        setcifsacl -S "ACL:CIFSTESTDOM\Administrator:0x0/0x0/FULL,ACL:CIFSTESTDOM\user2:0x0/0x0/FULL" <file_name>
-
-
-
+  setcifsacl -S "ACL:CIFSTESTDOM\Administrator:0x0/0x0/FULL,ACL:CIFSTESTDOM\user2:0x0/0x0/FULL" <file_name>
 
 *****
 NOTES
 *****
 
-
 Kernel support for getcifsacl/setcifsacl utilities was initially
 introduced in the 2.6.37 kernel.
 
-
 ********
 SEE ALSO
 ********
 
-
 mount.cifs(8), getcifsacl(1)
 
-
 ******
 AUTHOR
 ******
 
-
 Shirish Pargaonkar wrote the setcifsacl program.
 
 The Linux CIFS Mailing list is the preferred place to ask questions
 regarding these programs.
-
diff --git a/smbinfo.c b/smbinfo.c
 new file mode 100644
index 0000000..4bc503a
--- /dev/null
+++ b/smbinfo.c
@@ -0,0 +1,1134 @@
+/*
+ * smbinfo
+ *
+ * Copyright (C) Ronnie Sahlberg ([e-mail]) 2018
+ * Copyright (C) Aurelien Aptel ([e-mail]) 2018
+ *
+ * Display SMB-specific file information using cifs IOCTL
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include <endian.h>
+#include <errno.h>
+#include <getopt.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#define CIFS_IOCTL_MAGIC 0xCF
+
+/* query_info flags */
+#define PASSTHRU_QUERY_INFO     0x00000000
+#define PASSTHRU_FSCTL          0x00000001
+
+struct smb_query_info {
+	uint32_t   info_type;
+	uint32_t   file_info_class;
+	uint32_t   additional_information;
+	uint32_t   flags;
+	uint32_t   input_buffer_length;
+	uint32_t   output_buffer_length;
+	/* char buffer[]; */
+} __packed;
+
+#define CIFS_QUERY_INFO _IOWR(CIFS_IOCTL_MAGIC, 7, struct smb_query_info)
+#define INPUT_BUFFER_LENGTH 16384
+
+int verbose;
+
+static void
+usage(char *name)
+{
+	fprintf(stderr, "Usage: %s [-V] <command> <file>\n"
+		"-V for verbose output\n"
+		"Commands are\n"
+		"  fileaccessinfo:\n"
+		"      Prints FileAccessInfo for a cifs file.\n"
+		"  filealigninfo:\n"
+		"      Prints FileAlignInfo for a cifs file.\n"
+		"  fileallinfo:\n"
+		"      Prints FileAllInfo for a cifs file.\n"
+		"  filebasicinfo:\n"
+		"      Prints FileBasicInfo for a cifs file.\n"
+		"  fileeainfo:\n"
+		"      Prints FileEAInfo for a cifs file.\n"
+		"  filefsfullsizeinfo:\n"
+		"      Prints FileFsFullSizeInfo for a cifs share.\n"
+		"  fileinternalinfo:\n"
+		"      Prints FileInternalInfo for a cifs file.\n"
+		"  filemodeinfo:\n"
+		"      Prints FileModeInfo for a cifs file.\n"
+		"  filepositioninfo:\n"
+		"      Prints FilePositionInfo for a cifs file.\n"
+		"  filestandardinfo:\n"
+		"      Prints FileStandardInfo for a cifs file.\n"
+		"  fsctl-getobjid:\n"
+		"      Prints the objectid of the file and GUID of the underlying volume.\n"
+		"  list-snapshots:\n"
+		"      List the previous versions of the volume that backs this file.\n"
+		"  quota:\n"
+		"      Prints the quota for a cifs file.\n"
+		"  secdesc:\n"
+		"      Prints the security descriptor for a cifs file.\n",
+		name);
+	exit(1);
+}
+
+static void
+win_to_timeval(uint64_t smb2_time, struct timeval *tv)
+{
+	tv->tv_usec = (smb2_time / 10) % 1000000;
+	tv->tv_sec  = (smb2_time - 116444736000000000) / 10000000;
+}
+
+struct bit_string {
+	unsigned int bit;
+	char *string;
+};
+
+struct bit_string directory_access_mask[] = {
+	{ 0x00000001, "LIST_DIRECTORY" },
+	{ 0x00000002, "ADD_FILE" },
+	{ 0x00000004, "ADD_SUBDIRECTORY" },
+	{ 0x00000008, "READ_EA" },
+	{ 0x00000010, "WRITE_EA" },
+	{ 0x00000020, "TRAVERSE" },
+	{ 0x00000040, "DELETE_CHILD" },
+	{ 0x00000080, "READ_ATTRIBUTES" },
+	{ 0x00000100, "WRITE_ATTRIBUTES" },
+	{ 0x00010000, "DELETE" },
+	{ 0x00020000, "READ_CONTROL" },
+	{ 0x00040000, "WRITE_DAC" },
+	{ 0x00080000, "WRITE_OWNER" },
+	{ 0x00100000, "SYNCHRONIZER" },
+	{ 0x01000000, "ACCESS_SYSTEM_SECURITY" },
+	{ 0x02000000, "MAXIMUM_ALLOWED" },
+	{ 0x10000000, "GENERIC_ALL" },
+	{ 0x20000000, "GENERIC_EXECUTE" },
+	{ 0x40000000, "GENERIC_WRITE" },
+	{ 0x80000000, "GENERIC_READ" },
+	{ 0, NULL }
+};
+
+struct bit_string file_access_mask[] = {
+	{ 0x00000001, "READ_DATA" },
+	{ 0x00000002, "WRITE_DATA" },
+	{ 0x00000004, "APPEND_DATA" },
+	{ 0x00000008, "READ_EA" },
+	{ 0x00000010, "WRITE_EA" },
+	{ 0x00000020, "EXECUTE" },
+	{ 0x00000040, "DELETE_CHILD" },
+	{ 0x00000080, "READ_ATTRIBUTES" },
+	{ 0x00000100, "WRITE_ATTRIBUTES" },
+	{ 0x00010000, "DELETE" },
+	{ 0x00020000, "READ_CONTROL" },
+	{ 0x00040000, "WRITE_DAC" },
+	{ 0x00080000, "WRITE_OWNER" },
+	{ 0x00100000, "SYNCHRONIZER" },
+	{ 0x01000000, "ACCESS_SYSTEM_SECURITY" },
+	{ 0x02000000, "MAXIMUM_ALLOWED" },
+	{ 0x10000000, "GENERIC_ALL" },
+	{ 0x20000000, "GENERIC_EXECUTE" },
+	{ 0x40000000, "GENERIC_WRITE" },
+	{ 0x80000000, "GENERIC_READ" },
+	{ 0, NULL }
+};
+
+static void
+print_bits(uint32_t mask, struct bit_string *bs)
+{
+	int first = 1;
+
+	if (!verbose)
+		return;
+
+	while (bs->string) {
+		if (mask & bs->bit) {
+			printf("%s%s", first?"":",", bs->string);
+			first = 0;
+		}
+		bs++;
+	}
+	if (!first)
+		printf(" ");
+}
+
+static void
+print_guid(uint8_t *sd)
+{
+	uint32_t u32;
+	uint16_t u16;
+	int i;
+
+	memcpy(&u32, &sd[0], 4);
+	printf("%08x-", le32toh(u32));
+
+	memcpy(&u16, &sd[4], 2);
+	printf("%04x-", le16toh(u16));
+
+	memcpy(&u16, &sd[6], 2);
+	printf("%04x-", le16toh(u16));
+
+	printf("%02x%02x-", sd[8], sd[9]);
+	for (i = 0; i < 6; i++)
+		printf("%02x", sd[10 + i]);
+}
+
+static void
+print_objidbuf(uint8_t *sd)
+{
+	printf("Object-ID: ");
+	print_guid(&sd[0]);
+	printf("\n");
+
+	printf("Birth-Volume-ID: ");
+	print_guid(&sd[16]);
+	printf("\n");
+
+	printf("Birth-Object-ID: ");
+	print_guid(&sd[32]);
+	printf("\n");
+
+	printf("Domain-ID: ");
+	print_guid(&sd[48]);
+	printf("\n");
+}
+
+static void
+fsctlgetobjid(int f)
+{
+	struct smb_query_info *qi;
+	struct stat st;
+
+	fstat(f, &st);
+
+	qi = malloc(sizeof(struct smb_query_info) + 64);
+	memset(qi, 0, sizeof(qi) + 64);
+	qi->info_type = 0x9009c;