Merge ~vpa1977/ubuntu/+source/nfs-utils:merge-lp2030474 into ubuntu/+source/nfs-utils:ubuntu/devel

[Vladimir Petko]

Merge of nfs-utils 2.1.6

Summary of changes:
 - rebased existing commits
 - dropped patch integrated upstream.

PPA: ppa:vpa1977/nfs-utils [1]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/nfs-utils

Unmerged commits

6c5b047... by Vladimir Petko on 2023-08-07

changelog

d6a4159... by Vladimir Petko on 2023-08-07

update-maintainer

36e79fa... by Vladimir Petko on 2023-08-07

reconstruct-changelog

b9f0922... by Vladimir Petko on 2023-08-07

merge-changelogs

ffb229f... by Andreas Hasenack on 2023-02-19

    - d/not-installed: mark files we knowingly don't include in the
      packaging
      [Missed in previous d/changelog]

6216c38... by Andreas Hasenack on 2023-02-19

    - rpc.svcgssd fixes and improvements (LP: #1977745):
      + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also
        document the missing svcgssd options to the nfs.conf(5) manpage

596eb1f... by Andreas Hasenack on 2023-02-19

    - Move the regex module to a separate binary package libnfsidmap-regex
      (LP: #1974067):
      + d/control: new package, adjust breaks/conflicts
      + d/libnfsidmap-regex.install: install the plugin file
      + d/libnfsidmap1.install: don't install regex.so
        [missed in previous d/changelog]
      + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch:
        note that the regex plugin is in another package

a0f1d70... by Andreas Hasenack on 2023-02-19

      + d/t/{control, v3-mount}: specific NFSv3 mount test

2f5f6d6... by Andreas Hasenack on 2023-02-19

    - Add more DEP8 tests (LP: #1960828):
      + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts

81d4400... by Andreas Hasenack on 2023-02-19

      + d/rules: build with apport, and install the hook in the
        nfs-common package which is installed on both client and servers

diff --git a/.gitignore b/.gitignore
index df791a8..da666b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ support/nsm/sm_inter_clnt.c
 support/nsm/sm_inter_svc.c
 support/nsm/sm_inter_xdr.c
 support/include/sm_inter.h
+support/reexport/fsidd
 tests/nsm_client/nlm_sm_inter.h
 tests/nsm_client/nlm_sm_inter_clnt.c
 tests/nsm_client/nlm_sm_inter_svc.c
@@ -86,3 +87,5 @@ systemd/rpc-gssd.service
 cscope.*
 # generic editor backup et al
 *~
+# file generated by ctags
+tags
diff --git a/Makefile.in b/Makefile.in
index a8c54ee..b9aa115 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,6 +286,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -387,7 +389,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/NEWS b/NEWS
index e70ae8a..77872c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,32 +1,32 @@
 Significant changes for nfs-utils 1.1.0 - March/April 2007
 
- - rpc.lockd is gone.  One 3 old kernel releases need it.
- - rpc.rquotad is gone.  Use the one from the 'quota' package.
-   Everone else does.
+ - rpc.lockd is gone. One 3 old kernel releases need it.
+ - rpc.rquotad is gone. Use the one from the 'quota' package.
+   Everyone else does.
  - /sbin/{u,}mount.nfs{,4} are now installed so 'mount' will
    use these to mount nfs filesystems instead of internal code.
   + mount.nfs will check for 'statd' to be running when mounting
-    a filesystem which requires it.  If it is not running it will
+    a filesystem which requires it. If it is not running it will
     run "/usr/sbin/start-statd" to try to start it.
     If statd is not running and cannot be started, mount.nfs will
     refuse to mount the filesystem and will suggest the 'nolock'
     option.
  - Substantial changes to statd
   + The 'notify' process that must happen at boot has been split
-    into a separate program "sm-notify".  It ensures that it
-    only runs once even if you restart statd.  This is correct
+    into a separate program "sm-notify". It ensures that it
+    only runs once even if you restart statd. This is correct
     behaviour.
   + statd stores state in the files in /var/lib/nfs/sm/ so that
     if you kill and restart it, it will restore that state and
     continue working correctly.
   + statd makes more use of DNS lookup and should handle
-    multi-homed peers better.  In particular, files in
+    multi-homed peers better. In particular, files in
     /var/lib/nfs/sm/ are named with the Full Qualified Domain Name
     if available.
  - If you export a directory as 'crossmnt', all filesystems
    mounted beneath are automatically exported with the same
    options (unless explicitly exported with different options).
- - subtree_check is no-longer the default.  The default is now
+ - subtree_check is no-longer the default. The default is now
    no_subtree_check.
  - By default the system 'rpcgen' is used while building
    nfs-utils rather than the internal one.
@@ -43,14 +43,14 @@ Significant changes for nfs-utils 1.1.0 - March/April 2007
 
  - A new option, -n, was added to rpc.gssd which specifies that
    accesses by root should not use 'machine credentials' when
-   accessing NFS file systems mounted with Kerberos.  Using this
+   accessing NFS file systems mounted with Kerberos. Using this
    option allows the root user to access the NFS space using any
    Kerberos principal, rather than always using the machine
-   credentials.  However, its use also requires that root manually
+   credentials. However, its use also requires that root manually
    authenticate before attempting a mount with Kerberos.
 
    When rpc.gssd uses machine credentials, the selection algorithm has
-   been changed.  Instead of simply using the first "nfs/*" key in the
+   been changed. Instead of simply using the first "nfs/*" key in the
    keytab, the keytab is now searched for keys in the following
    defined order:
 
diff --git a/README b/README
index 5e98240..3b0e771 100644
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ Unpack the sources and run these commands:
     # ./configure
     # make
 
-To install binaries and documenation, run this command:
+To install binaries and documentation, run this command:
 
     # make install
 
@@ -40,7 +40,7 @@ Updating to the latest head after you've already got it.
 
 	git pull
 
-Building requires that autotools be installed.  To invoke them
+Building requires that autotools be installed. To invoke them
 simply
 
 	sh autogen.sh
@@ -70,7 +70,7 @@ scripts can be written to work correctly.
 3.1.  SERVER STARTUP
 
 
-   A/  mount -t nfsd /proc/fs/nfsd
+   A/  mount -t nfsd nfsd /proc/fs/nfsd
       This filesystem needs to be mount before most daemons,
       particularly exportfs, mountd, svcgssd, idmapd.
       It could be mounted once, or the script that starts each daemon
@@ -95,27 +95,27 @@ scripts can be written to work correctly.
 
    D/ rpc.statd --no-notify
        It is best if statd is started before nfsd though this isn't
-       critical.  Certainly it should be at most a few seconds after
+       critical. Certainly, it should be at most a few seconds after
        nfsd.
        When nfsd starts it will start lockd. If lockd then receives a
-       lock request it will communicate with statd.  If statd is not
+       lock request, it will communicate with statd. If statd is not
        running lockd will retry, but it won't wait forever for a
        reply.
        Note that if statd is started before nfsd, the --no-notify
-       option must be used.  If notify requests are sent out before
+       option must be used. If notify requests are sent out before
        nfsd start, clients may try to reclaim locks and, on finding
        that lockd isn't running, they will give up and never reclaim
        the lock.
        rpc.statd is only needed for NFSv2 and NFSv3 support.
 
    E/ rpc.nfsd
-       Starting nfsd will automatically start lockd.  The nfs server
+       Starting nfsd will automatically start lockd. The nfs server
        will now be fully active and respond to any requests from
        clients.
        
    F/ sm-notify
        This will notify any client which might have locks from before
-       a reboot to try to reclaim their locks.  This should start
+       a reboot to try to reclaim their locks. This should start
        immediately after rpc.nfsd is started so that clients have a
        chance to reclaim locks within the 90 second grace period.
        sm-notify is only needed for NFSv2 and NFSv3 support.
diff --git a/configure b/configure
index e14489e..2a29dd4 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.71 for linux nfs-utils 2.6.2.
+# Generated by GNU Autoconf 2.71 for linux nfs-utils 2.6.3.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='linux nfs-utils'
 PACKAGE_TARNAME='nfs-utils'
-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='linux nfs-utils 2.6.2'
+PACKAGE_VERSION='2.6.3'
+PACKAGE_STRING='linux nfs-utils 2.6.3'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -757,11 +757,15 @@ LIBTIRPC
 AM_CPPFLAGS
 TIRPC_LIBS
 TIRPC_CFLAGS
+CONFIG_NFSV4SERVER_FALSE
+CONFIG_NFSV4SERVER_TRUE
+LIBMOUNT_LIBS
+LIBMOUNT_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-CONFIG_NFSV4SERVER_FALSE
-CONFIG_NFSV4SERVER_TRUE
+CONFIG_NFSRAHEAD_FALSE
+CONFIG_NFSRAHEAD_TRUE
 MOUNT_CONFIG_FALSE
 MOUNT_CONFIG_TRUE
 enable_mountconfig
@@ -794,9 +798,6 @@ CONFIG_NFSV4_FALSE
 CONFIG_NFSV4_TRUE
 enable_nfsv4
 IDMAPD
-modprobedir
-INSTALL_MODPROBEDIR_FALSE
-INSTALL_MODPROBEDIR_TRUE
 unitdir
 INSTALL_SYSTEMD_FALSE
 INSTALL_SYSTEMD_TRUE
@@ -916,7 +917,6 @@ with_statdpath
 with_statduser
 with_start_statd
 with_systemd
-with_modprobedir
 enable_nfsv4
 enable_nfsv41
 enable_gss
@@ -933,6 +933,7 @@ enable_ipv6
 enable_mountconfig
 with_mountfile
 enable_nfsdcld
+enable_nfsrahead
 enable_nfsdcltrack
 enable_nfsv4server
 with_tirpcinclude
@@ -964,6 +965,8 @@ CPPFLAGS
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+LIBMOUNT_CFLAGS
+LIBMOUNT_LIBS
 TIRPC_CFLAGS
 TIRPC_LIBS
 XML2_CFLAGS
@@ -1526,7 +1529,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 linux nfs-utils 2.6.2 to adapt to many kinds of systems.
+\`configure' configures linux nfs-utils 2.6.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1597,7 +1600,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of linux nfs-utils 2.6.2:";;
+     short | recursive ) echo "Configuration of linux nfs-utils 2.6.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1633,6 +1636,7 @@ Optional Features:
   --disable-mountconfig   disable mount to use a configuration file
                           [default=no]
   --disable-nfsdcld       disable NFSv4 clientid tracking daemon [default=no]
+  --disable-nfsrahead     disable nfsrahead command [default=no]
   --disable-nfsdcltrack   disable NFSv4 clientid tracking programs
                           [default=no]
   --enable-nfsv4server    enable support for NFSv4 only server [default=no]
@@ -1665,9 +1669,6 @@ Optional Packages:
   --with-systemd[=unit-dir-path]
                           install systemd unit files [Default: no, and path
                           defaults to /usr/lib/systemd/system if not given]
-  --with-modprobedir[=modprobe-dir-path]
-                          install modprobe config files [Default:
-                          /usr/lib/modprobe.d]
   --with-rpcgen=internal  use internal rpcgen instead of system one
   --with-mountfile=filename
                           Using filename as the NFS mount options file
@@ -1701,6 +1702,10 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  LIBMOUNT_CFLAGS
+              C compiler flags for LIBMOUNT, overriding pkg-config
+  LIBMOUNT_LIBS
+              linker flags for LIBMOUNT, overriding pkg-config
   TIRPC_CFLAGS
               C compiler flags for TIRPC, overriding pkg-config
   TIRPC_LIBS  linker flags for TIRPC, overriding pkg-config
@@ -1788,7 +1793,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-linux nfs-utils configure 2.6.2
+linux nfs-utils configure 2.6.3
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2457,7 +2462,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 linux nfs-utils $as_me 2.6.2, which was
+It was created by linux nfs-utils $as_me 2.6.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4026,7 +4031,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nfs-utils'
- VERSION='2.6.2'
+ VERSION='2.6.3'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5675,29 +5680,6 @@ fi
 
 
 
-modprobedir=/usr/lib/modprobe.d
-
-# Check whether --with-modprobedir was given.
-if test ${with_modprobedir+y}
-then :
-  withval=$with_modprobedir; if test "$withval" != "no" ; then
-		modprobedir=$withval
-	else
-		modprobedir=
-	fi
-
-fi
-
-	 if test -n "$modprobedir"; then
-  INSTALL_MODPROBEDIR_TRUE=
-  INSTALL_MODPROBEDIR_FALSE='#'
-else
-  INSTALL_MODPROBEDIR_TRUE='#'
-  INSTALL_MODPROBEDIR_FALSE=
-fi
-
-
-
 # Check whether --enable-nfsv4 was given.
 if test ${enable_nfsv4+y}
 then :
@@ -6012,6 +5994,246 @@ else $as_nop
 fi
 
 
+# Check whether --enable-nfsrahead was given.
+if test ${enable_nfsrahead+y}
+then :
+  enableval=$enable_nfsrahead; enable_nfsrahead=$enableval
+else $as_nop
+  enable_nfsrahead="yes"
+fi
+
+	 if test "$enable_nfsrahead" = "yes" ; then
+  CONFIG_NFSRAHEAD_TRUE=
+  CONFIG_NFSRAHEAD_FALSE='#'
+else
+  CONFIG_NFSRAHEAD_TRUE='#'
+  CONFIG_NFSRAHEAD_FALSE=
+fi
+
+	if test "$enable_nfsrahead" = yes; then
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+	else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBMOUNT" >&5
+printf %s "checking for LIBMOUNT... " >&6; }
+
+if test -n "$LIBMOUNT_CFLAGS"; then
+    pkg_cv_LIBMOUNT_CFLAGS="$LIBMOUNT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mount\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mount") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBMOUNT_CFLAGS=`$PKG_CONFIG --cflags "mount" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBMOUNT_LIBS"; then
+    pkg_cv_LIBMOUNT_LIBS="$LIBMOUNT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mount\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mount") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBMOUNT_LIBS=`$PKG_CONFIG --libs "mount" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBMOUNT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mount" 2>&1`
+        else
+	        LIBMOUNT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mount" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBMOUNT_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (mount) were not met:
+
+$LIBMOUNT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBMOUNT_CFLAGS
+and LIBMOUNT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBMOUNT_CFLAGS
+and LIBMOUNT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	LIBMOUNT_CFLAGS=$pkg_cv_LIBMOUNT_CFLAGS
+	LIBMOUNT_LIBS=$pkg_cv_LIBMOUNT_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+fi
+	fi
+
 # Check whether --enable-nfsdcltrack was given.
 if test ${enable_nfsdcltrack+y}
 then :
@@ -7418,11 +7640,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7464,11 +7686,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -24825,12 +25047,12 @@ AM_CFLAGS="$my_am_cflags $flg1 $flg2 $flg3 $flg4 $flg5"
 ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
 
 
-# make _sysconfdir available for substituion in config files
+# make _sysconfdir available for substitution in config files
 # 2 "evals" needed late to expand variable names.
 
 
 
-# make _statedir available for substituion in config files
+# make _statedir available for substitution in config files
 # 2 "evals" needed late to expand variable names.
 
 
@@ -24842,12 +25064,12 @@ else
 fi
 
 
-# make _rpc_pipefsmount available for substituion in config files
+# make _rpc_pipefsmount available for substitution in config files
 # 2 "evals" needed late to expand variable names.
 
 
 
-ac_config_files="$ac_config_files Makefile systemd/rpc-gssd.service systemd/rpc_pipefs.target systemd/var-lib-nfs-rpc_pipefs.mount linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/junction/Makefile support/misc/Makefile support/nfs/Makefile support/nsm/Makefile support/nfsidmap/Makefile support/nfsidmap/libnfsidmap.pc tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile tools/nfsrahead/Makefile tools/rpcctl/Makefile tools/nfsdclnts/Makefile tools/nfsconf/Makefile tools/nfsdclddb/Makefile utils/Makefile utils/blkmapd/Makefile utils/nfsdcld/Makefile utils/nfsdcltrack/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/exportd/Makefile utils/nfsd/Makefile utils/nfsref/Makefile utils/nfsstat/Makefile utils/nfsidmap/Makefile utils/showmount/Makefile utils/statd/Makefile systemd/Makefile tests/Makefile tests/nsm_client/Makefile"
+ac_config_files="$ac_config_files Makefile systemd/rpc-gssd.service systemd/rpc_pipefs.target systemd/var-lib-nfs-rpc_pipefs.mount linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/junction/Makefile support/misc/Makefile support/nfs/Makefile support/nsm/Makefile support/nfsidmap/Makefile support/nfsidmap/libnfsidmap.pc support/reexport/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile tools/nfsrahead/Makefile tools/rpcctl/Makefile tools/nfsdclnts/Makefile tools/nfsconf/Makefile tools/nfsdclddb/Makefile utils/Makefile utils/blkmapd/Makefile utils/nfsdcld/Makefile utils/nfsdcltrack/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/exportd/Makefile utils/nfsd/Makefile utils/nfsref/Makefile utils/nfsstat/Makefile utils/nfsidmap/Makefile utils/showmount/Makefile utils/statd/Makefile systemd/Makefile tests/Makefile tests/nsm_client/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24990,10 +25212,6 @@ if test -z "${INSTALL_SYSTEMD_TRUE}" && test -z "${INSTALL_SYSTEMD_FALSE}"; then
   as_fn_error $? "conditional \"INSTALL_SYSTEMD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${INSTALL_MODPROBEDIR_TRUE}" && test -z "${INSTALL_MODPROBEDIR_FALSE}"; then
-  as_fn_error $? "conditional \"INSTALL_MODPROBEDIR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${CONFIG_NFSV4_TRUE}" && test -z "${CONFIG_NFSV4_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_NFSV4\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25038,6 +25256,10 @@ if test -z "${MOUNT_CONFIG_TRUE}" && test -z "${MOUNT_CONFIG_FALSE}"; then
   as_fn_error $? "conditional \"MOUNT_CONFIG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_NFSRAHEAD_TRUE}" && test -z "${CONFIG_NFSRAHEAD_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_NFSRAHEAD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_NFSV4SERVER_TRUE}" && test -z "${CONFIG_NFSV4SERVER_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_NFSV4SERVER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25471,7 +25693,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 linux nfs-utils $as_me 2.6.2, which was
+This file was extended by linux nfs-utils $as_me 2.6.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25539,7 +25761,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-linux nfs-utils config.status 2.6.2
+linux nfs-utils config.status 2.6.3
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -26072,6 +26294,7 @@ do
     "support/nsm/Makefile") CONFIG_FILES="$CONFIG_FILES support/nsm/Makefile" ;;
     "support/nfsidmap/Makefile") CONFIG_FILES="$CONFIG_FILES support/nfsidmap/Makefile" ;;
     "support/nfsidmap/libnfsidmap.pc") CONFIG_FILES="$CONFIG_FILES support/nfsidmap/libnfsidmap.pc" ;;
+    "support/reexport/Makefile") CONFIG_FILES="$CONFIG_FILES support/reexport/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/locktest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/locktest/Makefile" ;;
     "tools/nlmtest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nlmtest/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index f1c46c5..4ade528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-AC_INIT([linux nfs-utils],[2.6.2],[[e-mail]],[nfs-utils])
+AC_INIT([linux nfs-utils],[2.6.3],[[e-mail]],[nfs-utils])
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)
@@ -71,18 +71,6 @@ AC_ARG_WITH(systemd,
 	AM_CONDITIONAL(INSTALL_SYSTEMD, [test "$use_systemd" = 1])
 	AC_SUBST(unitdir)
 
-modprobedir=/usr/lib/modprobe.d
-AC_ARG_WITH(modprobedir,
-	[AS_HELP_STRING([--with-modprobedir@<:@=modprobe-dir-path@:>@],[install modprobe config files @<:@Default: /usr/lib/modprobe.d@:>@])],
-	if test "$withval" != "no" ; then
-		modprobedir=$withval
-	else
-		modprobedir=
-	fi
-	)
-	AM_CONDITIONAL(INSTALL_MODPROBEDIR, [test -n "$modprobedir"])
-	AC_SUBST(modprobedir)
-
 AC_ARG_ENABLE(nfsv4,
 	[AS_HELP_STRING([--disable-nfsv4],[disable support for NFSv4 @<:@default=no@:>@])],
 	enable_nfsv4=$enableval,
@@ -249,6 +237,16 @@ AC_ARG_ENABLE(nfsdcld,
 	enable_nfsdcld=$enableval,
 	enable_nfsdcld="yes")
 
+AC_ARG_ENABLE(nfsrahead,
+	[AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])],
+	enable_nfsrahead=$enableval,
+	enable_nfsrahead="yes")
+	AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ])
+	if test "$enable_nfsrahead" = yes; then
+		dnl Check for -lmount
+		PKG_CHECK_MODULES([LIBMOUNT], [mount])
+	fi
+
 AC_ARG_ENABLE(nfsdcltrack,
 	[AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])],
 	enable_nfsdcltrack=$enableval,
@@ -678,12 +676,12 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4 $flg5"])
 # Make sure that $ACLOCAL_FLAGS are used during a rebuild
 AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
 
-# make _sysconfdir available for substituion in config files
+# make _sysconfdir available for substitution in config files
 # 2 "evals" needed late to expand variable names.
 AC_SUBST([_sysconfdir])
 AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir])
 
-# make _statedir available for substituion in config files
+# make _statedir available for substitution in config files
 # 2 "evals" needed late to expand variable names.
 AC_SUBST([_statedir])
 AC_CONFIG_COMMANDS_PRE([eval eval _statedir=$statedir])
@@ -695,7 +693,7 @@ else
 fi
 AC_SUBST(rpc_pipefsmount)
 
-# make _rpc_pipefsmount available for substituion in config files
+# make _rpc_pipefsmount available for substitution in config files
 # 2 "evals" needed late to expand variable names.
 AC_SUBST([_rpc_pipefsmount])
 AC_CONFIG_COMMANDS_PRE([eval eval _rpc_pipefsmount=$rpc_pipefsmount])
@@ -719,6 +717,7 @@ AC_CONFIG_FILES([
 	support/nsm/Makefile
 	support/nfsidmap/Makefile
 	support/nfsidmap/libnfsidmap.pc
+	support/reexport/Makefile
 	tools/Makefile
 	tools/locktest/Makefile
 	tools/nlmtest/Makefile
diff --git a/debian/changelog b/debian/changelog
index ac87df3..252dbff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,105 @@
+<<<<<<< debian/changelog
+=======
+nfs-utils (1:2.6.3-3ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: don't provide libnfsidmap2 in libnfsidmap1. This
+      package contains not only plugins, but an actual shared library,
+      with a different soname.
+    - Update README file:
+      + d/README.Ubuntu: new /etc/nfs.conf config structure
+      + d/libnfsidmap1.docs, d/nfs-common.docs: install README.Ubuntu
+    - New apport hook (LP #1961058):
+      + d/source.apport: apport hook for nfs-utils
+      + d/control: build-depend dh-apport
+      + d/rules: build with apport, and install the hook in the
+        nfs-common package which is installed on both client and servers
+    - Add more DEP8 tests (LP #1960828):
+      + d/t/{control,kerberos-mount,util}: test NFSv4 krb5p mounts
+      + d/t/{control, v3-mount}: specific NFSv3 mount test
+    - Move the regex module to a separate binary package libnfsidmap-regex
+      (LP #1974067):
+      + d/control: new package, adjust breaks/conflicts
+      + d/libnfsidmap-regex.install: install the plugin file
+      + d/libnfsidmap1.install: don't install regex.so
+      + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch:
+        note that the regex plugin is in another package
+    - rpc.svcgssd fixes and improvements (LP #1977745):
+      + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also
+        document the missing svcgssd options to the nfs.conf(5) manpage
+    - d/not-installed: mark files we knowingly don't include in the
+      packaging
+  * Dropped changes:
+    - Rely on the generator units for the rpc_pipefs mount (LP #1971935):
+      + d/p/always-run-generator.patch: run the generator even if the
+        config differs from the built-in default
+      + d/rules: exclude the units we will let the generator produce
+      [Fixed in 1:2.6.3-1]
+
+ -- Vladimir Petko <[e-mail]>  Tue, 08 Aug 2023 09:54:52 +1200
+
+nfs-utils (1:2.6.3-3) unstable; urgency=medium
+
+  * nfs-idmapd.service: add network-online.target to Wants= and After=
+    (Closes: #1035840)
+  * libnfsidmap: try to get the domain directly from hostname if the DNS
+    lookup fails and always show the log message if the domain can't be
+    determined
+
+ -- Salvatore Bonaccorso <[e-mail]>  Tue, 01 Aug 2023 15:10:41 +0200
+
+nfs-utils (1:2.6.3-2) unstable; urgency=medium
+
+  * fsidd: provide better default socket name. (Closes: #1041147)
+  * nfs-kernel-server: Handle leftover /fsid.sock socket
+
+ -- Salvatore Bonaccorso <[e-mail]>  Mon, 24 Jul 2023 11:01:42 +0200
+
+nfs-utils (1:2.6.3-1) unstable; urgency=medium
+
+  [ Andreas Hasenack ]
+  * Rely on the generator units for the rpc_pipefs mount (Closes: #1014429)
+    - d/p/always-run-generator.patch: run the generator even if the config
+      differs from the built-in default
+    - d/rules: exclude the units we will let the generator produce
+
+  [ Ben Hutchings ]
+  * Remove obsolete postinst upgrade logic and nfsconvert.py
+  * init: Remove support for setting command-line options in /etc/default
+  * d/salsa-ci.yml: Add shellcheck job
+  * start-statd: Fix shellcheck warnings
+  * init: Fix shellcheck warnings and info, thanks to наб (Closes: #1017869)
+  * d/*.bug-script: Fix redundant use of cat noted by shellcheck
+
+  [ Salvatore Bonaccorso ]
+  * Upload to unstable
+
+ -- Salvatore Bonaccorso <[e-mail]>  Sun, 09 Jul 2023 10:34:04 +0200
+
+nfs-utils (1:2.6.3-1~exp1) experimental; urgency=medium
+
+  [ Ben Hutchings ]
+  * d/control: Remove obsolete dependencies on lsb-base
+
+  [ Salvatore Bonaccorso ]
+  * New upstream version 2.6.3
+  * nfs-kernel-server: export: Add fsidd
+  * nfs-kernel-server: Add fsid systemd service file
+  * debian/rules: Replace call to dpkg-architecture with Makefile snippet
+    include
+  * nfs-common: lintian-overrides: Adapt overrides to new format
+  * nfs-kernel-server: lintian-overrides: Adapt overrides to new format
+
+  [ наб ]
+  * d/nfs-common.bug-script: fix stray \ warnings
+  * d/nfs-kernel-server.bug-script: fix stray \ warnings
+
+  [ Debian Janitor ]
+  * Apply multi-arch hints: libnfsidmap-dev: Add Multi-Arch: same
+
+ -- Salvatore Bonaccorso <[e-mail]>  Sun, 23 Apr 2023 18:08:07 +0200
+
+>>>>>>> debian/changelog
 nfs-utils (1:2.6.2-4ubuntu1) lunar; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index e268002..e6a18e4 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/kernel-team/nfs-utils
 
 Package: nfs-kernel-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, netbase, lsb-base, keyutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, netbase, keyutils
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
@@ -34,7 +34,7 @@ Description: support for NFS kernel server
 Package: nfs-common
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnfsidmap1 (= ${binary:Version}), rpcbind, adduser, ucf, lsb-base, keyutils, python3
+Depends: ${shlibs:Depends}, ${misc:Depends}, libnfsidmap1 (= ${binary:Version}), rpcbind, adduser, ucf, keyutils, python3
 Suggests: open-iscsi, watchdog
 Provides: nfs-client
 Conflicts: nfs-client
@@ -48,6 +48,7 @@ Package: libnfsidmap-dev
 Section: libdevel
 Architecture: any
 Depends: libnfsidmap1 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: header files and docs for libnfsidmap
  Contains the header files and documentation for libnfsidmap
  for use in developing applications that use the libnfsidmap library.
diff --git a/debian/copyright b/debian/copyright
index f286135..6e68099 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,4 +87,3 @@ Copyright Notices
   Copyright (C) 2007 Chuck Lever <[e-mail]>
   Copyright (C) 2007 Oracle.  All rights reserved.
   Copyright (C) 2008 Oracle Corporation.  All rights reserved.
-  Copyright 2018, 2019 Red Hat, Inc.
diff --git a/debian/nfs-common.bug-script b/debian/nfs-common.bug-script
index 9b3dc0c..ae348bd 100644
--- a/debian/nfs-common.bug-script
+++ b/debian/nfs-common.bug-script
@@ -9,23 +9,23 @@ echo '-- rpcinfo --' >&3
 /usr/sbin/rpcinfo -p >&3
 
 echo '-- /etc/default/nfs-common --' >&3
-cat /etc/default/nfs-common|grep_no_match_ok -v -e '^\#' -e '^$' >&3
+grep_no_match_ok -v -e '^#' -e '^$' /etc/default/nfs-common >&3
 
 echo '-- /etc/nfs.conf --' >&3
-cat /etc/nfs.conf|grep_no_match_ok -v -e '^\#' -e '^$' >&3
+grep_no_match_ok -v -e '^#' -e '^$' /etc/nfs.conf >&3
 
 if [ -d /etc/nfs.conf.d ]; then
     for f in /etc/nfs.conf.d/*.conf; do
         echo "-- $f --" >&3
-        cat "$f" | grep_no_match_ok -v -e '^\#' -e '^$' >&3
+        grep_no_match_ok -v -e '^#' -e '^$' "$f" >&3
     done
 fi
 
 echo '-- /etc/idmapd.conf --' >&3
-cat /etc/idmapd.conf|grep_no_match_ok -v -e '^\#' -e '^$' >&3
+grep_no_match_ok -v -e '^#' -e '^$' /etc/idmapd.conf >&3
 
 echo '-- /etc/fstab --' >&3
-cat /etc/fstab|grep_no_match_ok nfs >&3
+grep_no_match_ok nfs /etc/fstab >&3
 
 echo '-- /proc/mounts --' >&3
-cat /proc/mounts|grep_no_match_ok nfs >&3
+grep_no_match_ok nfs /proc/mounts >&3
diff --git a/debian/nfs-common.default b/debian/nfs-common.default
index 0e373e6..7256fb2 100644
--- a/debian/nfs-common.default
+++ b/debian/nfs-common.default
@@ -5,13 +5,6 @@
 # Do you want to start the statd daemon? It is not needed for NFSv4.
 NEED_STATD=
 
-# Options for rpc.statd.
-#   Should rpc.statd listen on a specific port? This is especially useful
-#   when you have a port-based firewall. To use a fixed port, set this
-#   this variable to a statd argument like: "--port 4000 --outgoing-port 4001".
-#   For more information, see rpc.statd(8) or http://wiki.debian.org/SecuringNFS
-STATDOPTS=
-
 # Do you want to start the idmapd daemon? It is only needed for NFSv4.
 NEED_IDMAPD=
 
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 052de51..6480ba9 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -20,7 +20,6 @@ DEFAULTFILE=/etc/default/nfs-common
 NEED_STATD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/run/rpc_pipefs
-RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
@@ -40,7 +39,7 @@ AUTO_NEED_GSSD=no
 if [ -f /etc/fstab ]; then
     exec 9<&0 </etc/fstab
 
-    while read DEV MTPT FSTYPE OPTS REST
+    while read -r DEV _ _ OPTS _
     do
 	case $DEV in
 	    ''|\#*)
@@ -87,7 +86,7 @@ case "$NEED_GSSD" in
 esac
 
 do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]
+    if [ -x /sbin/modprobe ] && [ -f /proc/modules ]
     then
         modprobe -q "$1" || true
     fi
@@ -134,7 +133,7 @@ case "$1" in
 	    fi
 	    start-stop-daemon --start --oknodo --quiet \
 		--pidfile /run/rpc.statd.pid \
-	        --exec /sbin/rpc.statd -- $STATDOPTS
+	        --exec /sbin/rpc.statd
 	    RET=$?
 	    if [ $RET != 0 ]; then
 	        log_end_msg $RET
@@ -184,7 +183,7 @@ case "$1" in
 		    fi
 
 		    start-stop-daemon --start --oknodo --quiet \
-			    --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
+			    --exec /usr/sbin/rpc.gssd
 		    RET=$?
 	            if [ $RET != 0 ]; then
         	        log_end_msg $RET
diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index 5ebdf64..8604c0c 100644
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -29,6 +29,5 @@ debian/tmp/lib/systemd/system/nfs-idmapd.service
 debian/tmp/lib/systemd/system/nfs-client.target
 debian/tmp/lib/systemd/system/nfs-utils.service
 debian/tmp/usr/sbin/nfsconf
-debian/nfsconvert.py usr/share/nfs-common/
 debian/tmp/usr/lib/udev/rules.d/99-nfs.rules
 debian/tmp/usr/libexec/nfsrahead
diff --git a/debian/nfs-common.lintian-overrides b/debian/nfs-common.lintian-overrides
index 0a7fafc..b26b930 100644
--- a/debian/nfs-common.lintian-overrides
+++ b/debian/nfs-common.lintian-overrides
@@ -1,6 +1,6 @@
-nfs-common: file-missing-in-md5sums var/lib/nfs/state
+nfs-common: file-missing-in-md5sums var/lib/nfs/state [md5sums]
 nfs-common: elevated-privileges 4755 root/root [sbin/mount.nfs]
 # The mount.nfs and umount.nfs manual pages also cover these, but
 # lintian doesn't notice that
-nfs-common: no-manual-page sbin/mount.nfs4
-nfs-common: no-manual-page sbin/umount.nfs4
+nfs-common: no-manual-page [sbin/mount.nfs4]
+nfs-common: no-manual-page [sbin/umount.nfs4]
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 325f006..d0ffe74 100644
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -12,34 +12,11 @@ case "$1" in
             adduser --system --home /var/lib/nfs --no-create-home statd
         fi
 
-        # Don't make /var/lib/nfs owned by statd. Only sm and sm.bak need to be
-        # accessible by statd or sm-notify after they drop privileges.
-        # https://bugs.debian.org/940848 (CVE-2019-3689)
-        if dpkg --compare-versions "$2" lt 1:1.3.4-3; then
-                chown root:root /var/lib/nfs
-        fi
         chown statd: /var/lib/nfs/sm \
             /var/lib/nfs/sm.bak
         if [ -f /var/lib/nfs/state ]; then
             chown statd /var/lib/nfs/state
         fi
-
-	# Convert default files to /etc/nfs.conf.d/local.conf if they
-	# have been modified
-	if dpkg --compare-versions "$2" lt 1:2.6.1-1~exp2 &&
-	   ! md5sum --status --ignore-missing -c <<EOF
-ddcb1fbb90a14ff9850f22eed0127a10  /etc/default/nfs-common
-fa4e0530df26499ca3940353fbfbf241  /etc/default/nfs-kernel-server
-EOF
-	then
-	    mkdir -p /etc/nfs.conf.d
-	    /usr/share/nfs-common/nfsconvert.py
-	fi
-
-	# Remove obsolete symlinks for sysvinit runlevels 2-5
-	if dpkg --compare-versions "$2" lt 1:2.6.1-2~; then
-	    update-rc.d -f nfs-common remove
-	fi
     ;;
 esac
 
diff --git a/debian/nfs-kernel-server.bug-script b/debian/nfs-kernel-server.bug-script
index 5ad593f..50e1350 100644
--- a/debian/nfs-kernel-server.bug-script
+++ b/debian/nfs-kernel-server.bug-script
@@ -9,20 +9,20 @@ echo '-- rpcinfo --' >&3
 /usr/sbin/rpcinfo -p >&3
 
 echo '-- /etc/default/nfs-kernel-server --' >&3
-cat /etc/default/nfs-kernel-server|grep_no_match_ok -v -e '\#' -e '^$' >&3
+grep_no_match_ok -v -e '#' -e '^$' /etc/default/nfs-kernel-server >&3
 
 echo '-- /etc/nfs.conf --' >&3
-cat /etc/nfs.conf|grep_no_match_ok -v -e '^\#' -e '^$' >&3
+grep_no_match_ok -v -e '^#' -e '^$' /etc/nfs.conf >&3
 
 if [ -d /etc/nfs.conf.d ]; then
     for f in /etc/nfs.conf.d/*.conf; do
         echo "-- $f --" >&3
-        cat "$f" | grep_no_match_ok -v -e '^\#' -e '^$' >&3
+        grep_no_match_ok -v -e '^#' -e '^$' "$f" >&3
     done
 fi
 
 echo '-- /etc/exports --' >&3
-cat /etc/exports|grep_no_match_ok -v -e '^\#' -e '^$' >&3
+grep_no_match_ok -v -e '^#' -e '^$' /etc/exports >&3
 
 echo '-- /proc/fs/nfs/exports --' >&3
 cat /proc/fs/nfs/exports >&3
diff --git a/debian/nfs-kernel-server.default b/debian/nfs-kernel-server.default
index 7137dae..a747a28 100644
--- a/debian/nfs-kernel-server.default
+++ b/debian/nfs-kernel-server.default
@@ -1,19 +1,6 @@
-# Number of servers to start up
-RPCNFSDCOUNT=8
-
 # Runtime priority of server (see nice(1))
 RPCNFSDPRIORITY=0
 
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option. For more information, 
-# see rpc.mountd(8) or http://wiki.debian.org/SecuringNFS
-# To disable NFSv4 on the server, specify '--no-nfs-version 4' here
-RPCMOUNTDOPTS="--manage-gids"
-
 # Do you want to start the svcgssd daemon? It is only required for Kerberos
 # exports. Valid alternatives are "yes" and "no"; the default is "no".
 NEED_SVCGSSD=""
-
-# Options for rpc.svcgssd.
-RPCSVCGSSDOPTS=""
diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 88ee869..a8d4525 100644
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -25,11 +25,8 @@ PREFIX=/usr
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-kernel-server
-RPCNFSDCOUNT=8
 RPCNFSDPRIORITY=0
-RPCMOUNTDOPTS=
 NEED_SVCGSSD=no
-RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
@@ -38,7 +35,7 @@ fi
 . /lib/lsb/init-functions
 
 do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]
+    if [ -x /sbin/modprobe ] && [ -f /proc/modules ]
     then
         modprobe -q "$1" || true
     fi
@@ -66,6 +63,7 @@ case "$1" in
 			export_files="$export_files $file"
 		fi
 	done
+	# shellcheck disable=SC2086
 	if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' $export_files
 	then
 		do_modprobe nfsd
@@ -100,7 +98,7 @@ case "$1" in
 
 		start-stop-daemon --start --oknodo --quiet \
 		    --nicelevel $RPCNFSDPRIORITY \
-		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
+		    --exec $PREFIX/sbin/rpc.nfsd
 		RET=$?
 		if [ $RET != 0 ]; then
 			log_end_msg $RET
@@ -111,7 +109,7 @@ case "$1" in
 		ClearAddr=
 		if [ -f /proc/net/rpc/auth.unix.ip/channel ]
 		then
-		    fgrep -qs 127.0.0.1 /proc/net/rpc/auth.unix.ip/content || {
+		    grep -Fqs 127.0.0.1 /proc/net/rpc/auth.unix.ip/content || {
 			echo "nfsd 127.0.0.1 2147483647 localhost" >/proc/net/rpc/auth.unix.ip/channel
 			ClearAddr=yes
 		    }
@@ -123,7 +121,7 @@ case "$1" in
 			do_modprobe rpcsec_gss_krb5
 			log_progress_msg "svcgssd"
 			start-stop-daemon --start --oknodo --quiet \
-			    --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
+			    --exec $PREFIX/sbin/rpc.svcgssd
 			RET=$?
 			if [ $RET != 0 ]; then
 				log_end_msg $RET
@@ -133,7 +131,7 @@ case "$1" in
 
 		log_progress_msg "mountd"
 		start-stop-daemon --start --oknodo --quiet \
-		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
+		    --exec $PREFIX/sbin/rpc.mountd
 		RET=$?
 		if [ $RET != 0 ]; then
 			log_end_msg $RET
diff --git a/debian/nfs-kernel-server.install b/debian/nfs-kernel-server.install
index 955f74c..72fa1f8 100644
--- a/debian/nfs-kernel-server.install
+++ b/debian/nfs-kernel-server.install
@@ -1,5 +1,6 @@
 debian/tmp/usr/sbin/exportfs
 debian/tmp/sbin/nfsdcltrack
+debian/tmp/usr/sbin/fsidd
 debian/tmp/usr/sbin/nfsdcld
 debian/tmp/usr/sbin/nfsdclddb
 debian/tmp/usr/sbin/nfsdclnts
@@ -9,6 +10,7 @@ debian/tmp/var/lib/nfs/etab
 debian/tmp/var/lib/nfs/rmtab
 debian/nfs-kernel-server.default /usr/share/nfs-kernel-server/conffiles/
 debian/etc.exports /usr/share/nfs-kernel-server/conffiles/
+debian/tmp/lib/systemd/system/fsidd.service
 debian/tmp/lib/systemd/system/nfs-blkmap.service
 debian/tmp/lib/systemd/system/nfs-mountd.service
 debian/tmp/lib/systemd/system/nfs-server.service
diff --git a/debian/nfs-kernel-server.lintian-overrides b/debian/nfs-kernel-server.lintian-overrides
index 31c0167..10c1eef 100644
--- a/debian/nfs-kernel-server.lintian-overrides
+++ b/debian/nfs-kernel-server.lintian-overrides
@@ -1,2 +1,2 @@
-nfs-kernel-server: file-missing-in-md5sums var/lib/nfs/rmtab
-nfs-kernel-server: file-missing-in-md5sums var/lib/nfs/etab
+nfs-kernel-server: file-missing-in-md5sums var/lib/nfs/rmtab [md5sums]
+nfs-kernel-server: file-missing-in-md5sums var/lib/nfs/etab [md5sums]
diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
index 11a0d72..f0cdc44 100644
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -14,13 +14,14 @@ case "$1" in
 	    [ -e $f ] || touch $f
 	done
 
-	# Since upstream version 2.1.1 use of /var/lib/nfs/xtab
-	# has been removed and nfs-utils stops creating the file
-	if dpkg --compare-versions "$2" lt 1:2.1.1; then
-		    rm -f /var/lib/nfs/xtab
-	fi
-
 	update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
+
+	# Remove leftover /fsid.sock file on upgrade (Cf. #1041147)
+	if dpkg --compare-versions "$2" lt 1:2.6.3-2~; then
+		if [ -S /fsid.sock ]; then
+			rm -f /fsid.sock
+		fi
+	fi
     ;;
 esac
 
diff --git a/debian/nfsconvert.py b/debian/nfsconvert.py
deleted file mode 100755
index 8b48749..0000000
--- a/debian/nfsconvert.py
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/usr/bin/env python3
-"""
-Read in the /etc/default/nfs-{common,kernel-server} files and
-set the corresponding values in nfs.conf
-"""
-
-from __future__ import print_function
-import sys
-import getopt
-import subprocess
-
-CONF_NFS = '/etc/nfs.conf.d/local.conf'
-CONF_TOOL = '/usr/sbin/nfsconf'
-
-# options for nfsd found in RPCNFSDOPTS
-OPTS_NFSD = 'dH:p:rR:N:V:stTuUG:L:'
-LONG_NFSD = ['debug', 'host=', 'port=', 'rdma=', 'nfs-version=', 'no-nfs-version=',
-             'tcp', 'no-tcp', 'udp', 'no-udp', 'grace-time=', 'lease-time=']
-CONV_NFSD = {'-d': (CONF_NFS, 'nfsd', 'debug', 'all'),
-             '-H': (CONF_NFS, 'nfsd', 'host', ','),
-             '-p': (CONF_NFS, 'nfsd', 'port', '$1'),
-             '-r': (CONF_NFS, 'nfsd', 'rdma', 'nfsrdma'),
-             '-R': (CONF_NFS, 'nfsd', 'rdma', '$1'),
-             '-N': (CONF_NFS, 'nfsd', 'vers$1', 'n'),
-             '-V': (CONF_NFS, 'nfsd', 'vers$1', 'y'),
-             '-t': (CONF_NFS, 'nfsd', 'tcp', '1'),
-             '-T': (CONF_NFS, 'nfsd', 'tcp', '0'),
-             '-u': (CONF_NFS, 'nfsd', 'udp', '1'),
-             '-U': (CONF_NFS, 'nfsd', 'udp', '0'),
-             '-G': (CONF_NFS, 'nfsd', 'grace-time', '$1'),
-             '-L': (CONF_NFS, 'nfsd', 'lease-time', '$1'),
-             '$1': (CONF_NFS, 'nfsd', 'threads', '$1'),
-             '--debug': (CONF_NFS, 'nfsd', 'debug', 'all'),
-             '--host': (CONF_NFS, 'nfsd', 'host', ','),
-             '--port': (CONF_NFS, 'nfsd', 'port', '$1'),
-             '--rdma': (CONF_NFS, 'nfsd', 'rdma', '$1'),
-             '--no-nfs-version': (CONF_NFS, 'nfsd', 'vers$1', 'n'),
-             '--nfs-version': (CONF_NFS, 'nfsd', 'vers$1', 'y'),
-             '--tcp': (CONF_NFS, 'nfsd', 'tcp', '1'),
-             '--no-tcp': (CONF_NFS, 'nfsd', 'tcp', '0'),
-             '--udp': (CONF_NFS, 'nfsd', 'udp', '1'),
-             '--no-udp': (CONF_NFS, 'nfsd', 'udp', '0'),
-             '--grace-time': (CONF_NFS, 'nfsd', 'grace-time', '$1'),
-             '--lease-time': (CONF_NFS, 'nfsd', 'lease-time', '$1'),
-            }
-
-# options for mountd found in RPCMOUNTDOPTS
-OPTS_MOUNTD = 'go:d:H:p:N:nrus:t:V:'
-LONG_MOUNTD = ['descriptors=', 'debug=', 'nfs-version=', 'no-nfs-version=',
-               'port=', 'no-tcp', 'ha-callout=', 'state-directory-path=',
-               'num-threads=', 'reverse-lookup', 'manage-gids', 'no-udp']
-
-CONV_MOUNTD = {'-g': (CONF_NFS, 'mountd', 'manage-gids', '1'),
-               '-o': (CONF_NFS, 'mountd', 'descriptors', '$1'),
-               '-d': (CONF_NFS, 'mountd', 'debug', '$1'),
-               '-H': (CONF_NFS, 'mountd', 'ha-callout', '$1'),
-               '-p': (CONF_NFS, 'mountd', 'port', '$1'),
-               '-N': (CONF_NFS, 'nfsd', 'vers$1', 'n'),
-               '-V': (CONF_NFS, 'nfsd', 'vers$1', 'y'),
-               '-n': (CONF_NFS, 'nfsd', 'tcp', '0'),
-               '-s': (CONF_NFS, 'mountd', 'stat-directory-path', '$1'),
-               '-t': (CONF_NFS, 'mountd', 'threads', '$1'),
-               '-r': (CONF_NFS, 'mountd', 'reverse-lookup', '1'),
-               '-u': (CONF_NFS, 'nfsd', 'udp', '0'),
-               '--manage-gids': (CONF_NFS, 'mountd', 'manage-gids', '1'),
-               '--descriptors': (CONF_NFS, 'mountd', 'descriptors', '$1'),
-               '--debug': (CONF_NFS, 'mountd', 'debug', '$1'),
-               '--ha-callout': (CONF_NFS, 'mountd', 'ha-callout', '$1'),
-               '--port': (CONF_NFS, 'mountd', 'port', '$1'),
-               '--nfs-version': (CONF_NFS, 'nfsd', 'vers$1', 'y'),
-               '--no-nfs-version': (CONF_NFS, 'nfsd', 'vers$1', 'n'),
-               '--no-tcp': (CONF_NFS, 'nfsd', 'tcp', '0'),
-               '--state-directory-path': (CONF_NFS, 'mountd', 'state-directory-path', '$1'),
-               '--num-threads': (CONF_NFS, 'mountd', 'threads', '$1'),
-               '--reverse-lookup': (CONF_NFS, 'mountd', 'reverse-lookup', '1'),
-               '--no-udp': (CONF_NFS, 'nfsd', 'udp', '0'),
-              }
-# We enable manage-gids by default.  But if /etc/default/nfs-common
-# was modified then we need to set manage-gids = 0 unless we see
-# --manage-gids.
-INIT_MOUNTD = [(CONF_NFS, 'mountd', 'manage-gids', '0')]
-
-# options for statd found in STATDOPTS
-OPTS_STATD = 'o:p:T:U:n:P:H:'
-LONG_STATD = ['outgoing-port=', 'port=', 'name=', 'state-directory-path=',
-              'ha-callout=', 'nlm-port=', 'nlm-udp-port=']
-CONV_STATD = {'-o': (CONF_NFS, 'statd', 'outgoing-port', '$1'),
-              '-p': (CONF_NFS, 'statd', 'port', '$1'),
-              '-T': (CONF_NFS, 'lockd', 'port', '$1'),
-              '-U': (CONF_NFS, 'lockd', 'udp-port', '$1'),
-              '-n': (CONF_NFS, 'statd', 'name', '$1'),
-              '-P': (CONF_NFS, 'statd', 'state-directory-path', '$1'),
-              '-H': (CONF_NFS, 'statd', 'ha-callout', '$1'),
-              '--outgoing-port': (CONF_NFS, 'statd', 'outgoing-port', '$1'),
-              '--port': (CONF_NFS, 'statd', 'port', '$1'),
-              '--name': (CONF_NFS, 'statd', 'name', '$1'),
-              '--state-directory-path': (CONF_NFS, 'statd', 'state-directory-path', '$1'),
-              '--ha-callout': (CONF_NFS, 'statd', 'ha-callout', '$1'),
-              '--nlm-port': (CONF_NFS, 'lockd', 'port', '$1'),
-              '--nlm-udp-port': (CONF_NFS, 'lockd', 'udp-port', '$1'),
-             }
-
-# options for gssd found in RPCGSSDOPTS
-OPTS_GSSD = 'Mnvrp:k:d:t:T:R:lD'
-CONV_GSSD = {'-M': (CONF_NFS, 'gssd', 'use-memcache', '1'),
-             '-n': (CONF_NFS, 'gssd', 'root_uses_machine_creds', '0'),
-             '-v': (CONF_NFS, 'gssd', 'verbosity', '+'),
-             '-r': (CONF_NFS, 'gssd', 'rpc-verbosity', '+'),
-             '-p': (CONF_NFS, 'general', 'pipefs-directory', '$1'),
-             '-k': (CONF_NFS, 'gssd', 'keytab-file', '$1'),
-             '-d': (CONF_NFS, 'gssd', 'cred-cache-directory', '$1'),
-             '-t': (CONF_NFS, 'gssd', 'context-timeout', '$1'),
-             '-T': (CONF_NFS, 'gssd', 'rpc-timeout', '$1'),
-             '-R': (CONF_NFS, 'gssd', 'preferred-realm', '$1'),
-             '-l': (CONF_NFS, 'gssd', 'limit-to-legacy-enctypes', '0'),
-             '-D': (CONF_NFS, 'gssd', 'avoid-dns', '0'),
-            }
-
-# options for svcgssd found in RPCSVCGSSDOPTS
-OPTS_SVCGSSD = 'ivrnp:'
-CONV_SVCGSSD = {'-i': (CONF_NFS, 'svcgssd', 'idmap-verbosity', '+'),
-                '-v': (CONF_NFS, 'svcgssd', 'verbosity', '+'),
-                '-r': (CONF_NFS, 'svcgssd', 'rpc-verbosity', '+'),
-                '-n': (CONF_NFS, 'svcgssd', 'principal', 'system'),
-                '-p': (CONF_NFS, 'svcgssd', 'principal', '$1'),
-               }
-
-# meta list of all the getopt lists
-GETOPT_MAPS = [('RPCNFSDOPTS', OPTS_NFSD, LONG_NFSD, CONV_NFSD, []),
-               ('RPCMOUNTDOPTS', OPTS_MOUNTD, LONG_MOUNTD, CONV_MOUNTD, INIT_MOUNTD),
-               ('STATDOPTS', OPTS_STATD, LONG_STATD, CONV_STATD, []),
-               ('RPCGSSDOPTS', OPTS_GSSD, [], CONV_GSSD, []),
-               ('RPCSVCGSSDOPTS', OPTS_SVCGSSD, [], CONV_SVCGSSD, []),
-              ]
-
-# map for all of the single option values
-VALUE_MAPS = {'RPCNFSDCOUNT': (CONF_NFS, 'nfsd', 'threads', '$1'),
-             }
-
-def eprint(*args, **kwargs):
-    """ Print error to stderr """
-    print(*args, file=sys.stderr, **kwargs)
-
-def makesub(param, value):
-    """ Variable substitution """
-    return param.replace('$1', value)
-
-def set_value(value, entry):
-    """ Set a configuration value by running nfsconf tool"""
-    cfile, section, tag, param = entry
-
-    tag = makesub(tag, value)
-    param = makesub(param, value)
-    if param == '+':
-        param = value
-    if param == ',':
-        param = value
-    args = [CONF_TOOL, "--file", cfile, "--set", section, tag, param]
-
-    try:
-        subprocess.check_output(args, stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("Error running nfs-conf tool:\n %s" % (e.output.decode()))
-        print("Args: %s\n" % args)
-        raise Exception
-
-def convert_getopt(optname, options, optstring, longopts, conversions, init):
-    """ Parse option string into seperate config items
-
-        Take a getopt string and a table of conversions
-        parse it all and spit out the converted config
-
-        Keyword arguments:
-        options -- the argv string to convert
-        optstring --  getopt format option list
-        conversions -- table of translations
-    """
-    optcount = 0
-    try:
-        args = options.strip('\"').split()
-        optlist, optargs = getopt.gnu_getopt(args, optstring, longopts=longopts)
-    except getopt.GetoptError as err:
-        eprint(err)
-        raise Exception
-
-    for c in init:
-        set_value('', c)
-
-    setlist = {}
-    for (k, v) in optlist:
-        if k in conversions:
-            # it's already been set once
-            param = conversions[k][3]
-            tag = k + makesub(conversions[k][2], v)
-            if tag in setlist:
-                value = setlist[tag][0]
-                # is it a cummulative entry
-                if param == '+':
-                    value = str(int(value) + 1)
-                if param == ',':
-                    value += "," + v
-            else:
-                if param == '+':
-                    value = "1"
-                elif param == ',':
-                    value = v
-                else:
-                    value = v
-            setlist[tag] = (value, conversions[k])
-        else:
-            if v:
-                eprint("Ignoring unrecognised option %s=%s in %s" % (k, v, optname))
-            else:
-                eprint("Ignoring unrecognised option %s in %s" % (k, optname))
-
-
-    for v, c in setlist.values():
-        try:
-            set_value(v, c)
-            optcount += 1
-        except Exception:
-            raise
-
-    i = 1
-    for o in optargs:
-        opname = '$' + str(i)
-        if opname in conversions:
-            try:
-                set_value(o, conversions[opname])
-                optcount += 1
-            except Exception:
-                raise
-        else:
-            eprint("Unrecognised trailing arguments")
-            raise Exception
-        i += 1
-
-    return optcount
-
-def load_old_config():
-    """ Load the old configuration
-
-        Since "default" files were always meant to be parsed by a
-        shell, run a shell script to read them and dump the values.
-    """
-    names = ([name for (name, _, _, _, _) in GETOPT_MAPS]
-             + list(VALUE_MAPS.keys()))
-    script = ''.join(
-        [f'{name}=\n' for name in names]
-        + [f'[ -r {file_name} ] && . {file_name} >/dev/null\n'
-           for file_name in ['/etc/default/nfs-common',
-                             '/etc/default/nfs-kernel-server']]
-        + [f'printf \'{name}=%s\\n\' "${name}"\n' for name in names])
-    config = {}
-    with subprocess.Popen(script, shell=True,
-                          stdout=subprocess.PIPE, text=True) as proc:
-        for line in proc.stdout:
-            name, value = line.rstrip('\n').split('=', 1)
-            config[name] = value
-    return config
-
-def map_values():
-    """ Main function """
-    mapcount = 0
-
-    config = load_old_config()
-
-    # Map all the getopt option lists
-    for (name, opts, lopts, conv, init) in GETOPT_MAPS:
-        if name in config:
-            try:
-                mapcount += convert_getopt(name, config[name], opts,
-                                           lopts, conv, init)
-            except Exception:
-                eprint("Error whilst converting %s to nfsconf options." % (name))
-                raise
-
-    # Map the single value options
-    for name, opts in VALUE_MAPS.items():
-        if name in config:
-            try:
-                value = config[name]
-                set_value(value.strip('\"'), opts)
-                mapcount += 1
-            except Exception:
-                raise
-
-# Main routine
-try:
-    map_values()
-except Exception as e:
-    eprint(e)
-    eprint("Conversion failed. Please correct the error and try again.")
-    sys.exit(1)
diff --git a/debian/patches/Revert-configure-make-modprobe.d-directory-configura.patch b/debian/patches/Revert-configure-make-modprobe.d-directory-configura.patch
deleted file mode 100644
index 9df4dd5..0000000
--- a/debian/patches/Revert-configure-make-modprobe.d-directory-configura.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 89ea291577cf3b01ec20883c9d0a8a3c8c68d9b2 Mon Sep 17 00:00:00 2001
-From: Salvatore Bonaccorso <[e-mail]>
-Date: Mon, 5 Dec 2022 15:28:25 -0500
-Subject: [PATCH 1/4] Revert "configure: make modprobe.d directory configurable"
-
-This reverts commit 7d76dd2e6f09a141eb6303b7343baa5c4f9c85ad.
-
-This is part of the full revert of adding support via modprobe.d
-configuration to set sysctl settings of NFS-related modules when loading
-the modules.
-
-The approach caused problems with sysctl from busybox and with kmod as
-reported in Debian (https://bugs.debian.org/1024082).
-
-Signed-off-by: Salvatore Bonaccorso <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- configure.ac        | 12 ------------
- systemd/Makefile.am |  6 ++----
- 2 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5d9cbf317453..4280cc770a45 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,18 +71,6 @@ AC_ARG_WITH(systemd,
- 	AM_CONDITIONAL(INSTALL_SYSTEMD, [test "$use_systemd" = 1])
- 	AC_SUBST(unitdir)
- 
--modprobedir=/usr/lib/modprobe.d
--AC_ARG_WITH(modprobedir,
--	[AS_HELP_STRING([--with-modprobedir@<:@=modprobe-dir-path@:>@],[install modprobe config files @<:@Default: /usr/lib/modprobe.d@:>@])],
--	if test "$withval" != "no" ; then
--		modprobedir=$withval
--	else
--		modprobedir=
--	fi
--	)
--	AM_CONDITIONAL(INSTALL_MODPROBEDIR, [test -n "$modprobedir"])
--	AC_SUBST(modprobedir)
--
- AC_ARG_ENABLE(nfsv4,
- 	[AS_HELP_STRING([--disable-nfsv4],[disable support for NFSv4 @<:@default=no@:>@])],
- 	enable_nfsv4=$enableval,
-diff --git a/systemd/Makefile.am b/systemd/Makefile.am
-index 7b5ab84bd793..63a50bf2c07e 100644
---- a/systemd/Makefile.am
-+++ b/systemd/Makefile.am
-@@ -82,7 +82,5 @@ install-data-hook: $(unit_files) $(modprobe_files)
- else
- install-data-hook: $(modprobe_files)
- endif
--if INSTALL_MODPROBEDIR
--	mkdir -p $(DESTDIR)$(modprobedir)
--	cp $(modprobe_files) $(DESTDIR)$(modprobedir)
--endif
-+	mkdir -p $(DESTDIR)/usr/lib/modprobe.d
-+	cp $(modprobe_files) $(DESTDIR)/usr/lib/modprobe.d/
--- 
-2.38.1
-
diff --git a/debian/patches/Revert-modprobe-protect-against-sysctl-errors.patch b/debian/patches/Revert-modprobe-protect-against-sysctl-errors.patch
deleted file mode 100644
index cb9d368..0000000
--- a/debian/patches/Revert-modprobe-protect-against-sysctl-errors.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5bab9cbc9ff3d071f1e297d7bfff70f40ca9e78e Mon Sep 17 00:00:00 2001
-From: Salvatore Bonaccorso <[e-mail]>
-Date: Mon, 5 Dec 2022 15:30:55 -0500
-Subject: [PATCH 2/4] Revert "modprobe: protect against sysctl errors"
-
-This reverts commit 5e60e38aa4ba251ef66610514be5f45c41519e0f.
-
-This is part of the full revert of adding support via modprobe.d
-configuration to set sysctl settings of NFS-related modules when loading
-the modules.
-
-The approach caused problems with sysctl from busybox and with kmod as
-reported in Debian (https://bugs.debian.org/1024082).
-
-Signed-off-by: Salvatore Bonaccorso <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- systemd/50-nfs.conf | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/systemd/50-nfs.conf b/systemd/50-nfs.conf
-index 19e8ee734c8e..b56b2d765969 100644
---- a/systemd/50-nfs.conf
-+++ b/systemd/50-nfs.conf
-@@ -1,16 +1,16 @@
- # Ensure all NFS systctl settings get applied when modules load
- 
- # sunrpc module supports "sunrpc.*" sysctls
--install sunrpc /sbin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && { /sbin/sysctl -q --pattern sunrpc --system; exit 0; }
-+install sunrpc /sbin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc --system
- 
- # rpcrdma module supports sunrpc.svc_rdma.*
--install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && { /sbin/sysctl -q --pattern sunrpc.svc_rdma --system; exit 0; }
-+install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc.svc_rdma --system
- 
- # lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls
--install lockd /sbin/modprobe --ignore-install lockd $CMDLINE_OPTS && { /sbin/sysctl -q --pattern fs.nfs.n[sl]m --system; exit 0; }
-+install lockd /sbin/modprobe --ignore-install lockd $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs.n[sl]m --system
- 
- # nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout)
--install nfsv4 /sbin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && { /sbin/sysctl -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system; exit 0; }
-+install nfsv4 /sbin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && /sbin/sysctl -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system
- 
- # nfs module supports "fs.nfs.*" sysctls
--install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && { /sbin/sysctl -q --pattern fs.nfs --system; exit 0; }
-+install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs --system
--- 
-2.38.1
-
diff --git a/debian/patches/Revert-systemd-Apply-all-sysctl-settings-when-NFS-re.patch b/debian/patches/Revert-systemd-Apply-all-sysctl-settings-when-NFS-re.patch
deleted file mode 100644
index bc68df9..0000000
--- a/debian/patches/Revert-systemd-Apply-all-sysctl-settings-when-NFS-re.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d8d29f851993f67c053d9712e92244b2f53c4f65 Mon Sep 17 00:00:00 2001
-From: Salvatore Bonaccorso <[e-mail]>
-Date: Mon, 5 Dec 2022 15:37:32 -0500
-Subject: [PATCH 3/4] Revert "systemd: Apply all sysctl settings when
- NFS-related modules are loaded"
-
-This reverts commit afc7132dfb212ac1f676a5ac36d29a9e06325645.
-
-The approach caused problems with sysctl from busybox and with kmod as
-reported in Debian (https://bugs.debian.org/1024082).
-
-Signed-off-by: Salvatore Bonaccorso <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- systemd/50-nfs.conf | 16 ----------------
- systemd/Makefile.am | 10 ++--------
- 2 files changed, 2 insertions(+), 24 deletions(-)
- delete mode 100644 systemd/50-nfs.conf
-
-diff --git a/systemd/50-nfs.conf b/systemd/50-nfs.conf
-deleted file mode 100644
-index b56b2d765969..000000000000
---- a/systemd/50-nfs.conf
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# Ensure all NFS systctl settings get applied when modules load
--
--# sunrpc module supports "sunrpc.*" sysctls
--install sunrpc /sbin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc --system
--
--# rpcrdma module supports sunrpc.svc_rdma.*
--install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc.svc_rdma --system
--
--# lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls
--install lockd /sbin/modprobe --ignore-install lockd $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs.n[sl]m --system
--
--# nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout)
--install nfsv4 /sbin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && /sbin/sysctl -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system
--
--# nfs module supports "fs.nfs.*" sysctls
--install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs --system
-diff --git a/systemd/Makefile.am b/systemd/Makefile.am
-index 63a50bf2c07e..e7f5d818a913 100644
---- a/systemd/Makefile.am
-+++ b/systemd/Makefile.am
-@@ -2,8 +2,6 @@
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
--modprobe_files = 50-nfs.conf
--
- unit_files =  \
-     nfs-client.target \
-     rpc_pipefs.target \
-@@ -53,7 +51,7 @@ endif
- 
- man5_MANS	= nfs.conf.man
- man7_MANS	= nfs.systemd.man
--EXTRA_DIST = $(unit_files) $(modprobe_files) $(man5_MANS) $(man7_MANS)
-+EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)
- 
- generator_dir = $(unitdir)/../system-generators
- 
-@@ -75,12 +73,8 @@ rpc_pipefs_generator_LDADD = ../support/nfs/libnfs.la
- 
- if INSTALL_SYSTEMD
- genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator
--install-data-hook: $(unit_files) $(modprobe_files)
-+install-data-hook: $(unit_files)
- 	mkdir -p $(DESTDIR)/$(unitdir)
- 	cp $(unit_files) $(DESTDIR)/$(unitdir)
- 	cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount)
--else
--install-data-hook: $(modprobe_files)
- endif
--	mkdir -p $(DESTDIR)/usr/lib/modprobe.d
--	cp $(modprobe_files) $(DESTDIR)/usr/lib/modprobe.d/
--- 
-2.38.1
-
diff --git a/debian/patches/always-run-generator.patch b/debian/patches/always-run-generator.patch
index ba420c5..ed82672 100644
--- a/debian/patches/always-run-generator.patch
+++ b/debian/patches/always-run-generator.patch
@@ -3,8 +3,13 @@ Description: Always run the generator
 Author: Andreas Hasenack <[e-mail]>
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1971935
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014429
+<<<<<<< debian/patches/always-run-generator.patch
 Forwarded: https://marc.info/?l=linux-nfs&m=165754514206399&w=4
 Last-Updated: 2022-07-12
+=======
+Forwarded: https://lore.kernel.org/linux-nfs/[e-mail]/
+Last-Update: 2022-07-12
+>>>>>>> debian/patches/always-run-generator.patch
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 diff --git a/systemd/rpc-pipefs-generator.c b/systemd/rpc-pipefs-generator.c
diff --git a/debian/patches/auth-rpcgss-module.service-Don-t-fail-inside-linux-c.patch b/debian/patches/auth-rpcgss-module.service-Don-t-fail-inside-linux-c.patch
deleted file mode 100644
index f9da1c6..0000000
--- a/debian/patches/auth-rpcgss-module.service-Don-t-fail-inside-linux-c.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ca5b0e7e4d41d93483427390d6d5e031b0b7c6af Mon Sep 17 00:00:00 2001
-From: Joachim Falk <[e-mail]>
-Date: Mon, 5 Dec 2022 15:52:53 -0500
-Subject: [PATCH] auth-rpcgss-module.service: Don't fail inside linux
- container.
-
-Only try to load the auth_rpcgss kernel module if we are not executing
-inside a Linux container. Otherwise, the auth-rpcgss-module service will
-fail inside a Linux container as the loading of kernel modules is
-forbidden for the container. Thus, the "/sbin/modprobe -q auth_rpcgss"
-call will fail even if the auth_rpcgss kernel module is already loaded.
-This situation occurs when the container host has already loaded the
-auth_rpcgss kernel module to enable kerberized NFS service for its
-containers. This behavior has been tested with kmod up to version
-30+20220630-3 (current in bookworm as of 2022-09-20).
-
-Bug-Debian: http://bugs.debian.org/985000
-Discussion-Debian: https://salsa.debian.org/kernel-team/nfs-utils/-/merge_requests/7
-
-Signed-off-by: Joachim Falk <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- systemd/auth-rpcgss-module.service | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/systemd/auth-rpcgss-module.service b/systemd/auth-rpcgss-module.service
-index 4548283377d0..25c9de8088fc 100644
---- a/systemd/auth-rpcgss-module.service
-+++ b/systemd/auth-rpcgss-module.service
-@@ -10,6 +10,7 @@ DefaultDependencies=no
- Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service
- Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service
- ConditionPathExists=/etc/krb5.keytab
-+ConditionVirtualization=!container
- 
- [Service]
- Type=oneshot
--- 
-2.38.1
-
diff --git a/debian/patches/blkmapd-fix-coredump-in-bl_add_disk.patch b/debian/patches/blkmapd-fix-coredump-in-bl_add_disk.patch
deleted file mode 100644
index db3c216..0000000
--- a/debian/patches/blkmapd-fix-coredump-in-bl_add_disk.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From: Lixiaokeng <[e-mail]>
-Date: Mon, 24 Oct 2022 13:00:50 -0400
-Subject: blkmapd: fix coredump in bl_add_disk
-Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=c1c35487aba2cec828d9b8a1be9043000beadea5
-Bug-Debian: https://bugs.debian.org/1022185
-
-The serial->data is not malloced separately (just part of
-the serial), so it can't be freed. The bl_serial has its
-own free function. Use it.
-
-Signed-off-by: Lixiaokeng <[e-mail]>
-Signed-off-by: Zhiqiang Liu <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- utils/blkmapd/device-discovery.c | 15 +++------------
- utils/blkmapd/device-discovery.h |  2 ++
- utils/blkmapd/device-inq.c       |  4 ++--
- 3 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
-index 49935c2e19fe..bd890598d73c 100644
---- a/utils/blkmapd/device-discovery.c
-+++ b/utils/blkmapd/device-discovery.c
-@@ -187,10 +187,7 @@ static void bl_add_disk(char *filepath)
- 	}
- 
- 	if (disk && diskpath) {
--		if (serial) {
--			free(serial->data);
--			free(serial);
--		}
-+		bl_free_scsi_string(serial);
- 		return;
- 	}
- 
-@@ -228,10 +225,7 @@ static void bl_add_disk(char *filepath)
- 			disk->size = size;
- 			disk->valid_path = path;
- 		}
--		if (serial) {
--			free(serial->data);
--			free(serial);
--		}
-+		bl_free_scsi_string(serial);
- 	}
- 	return;
- 
-@@ -241,10 +235,7 @@ static void bl_add_disk(char *filepath)
- 			free(path->full_path);
- 		free(path);
- 	}
--	if (serial) {
--		free(serial->data);
--		free(serial);
--	}
-+	bl_free_scsi_string(serial);
- 	return;
- }
- 
-diff --git a/utils/blkmapd/device-discovery.h b/utils/blkmapd/device-discovery.h
-index a86eed9945c0..462aa943bc28 100644
---- a/utils/blkmapd/device-discovery.h
-+++ b/utils/blkmapd/device-discovery.h
-@@ -151,6 +151,8 @@ uint64_t process_deviceinfo(const char *dev_addr_buf,
- 
- extern ssize_t atomicio(ssize_t(*f) (int, void *, size_t),
- 			int fd, void *_s, size_t n);
-+extern struct bl_serial *bl_create_scsi_string(int len, const char *bytes);
-+extern void bl_free_scsi_string(struct bl_serial *str);
- extern struct bl_serial *bldev_read_serial(int fd, const char *filename);
- extern enum bl_path_state_e bldev_read_ap_state(int fd);
- extern int bl_discover_devices(void);
-diff --git a/utils/blkmapd/device-inq.c b/utils/blkmapd/device-inq.c
-index c7952c3e95c3..9e5749ef508b 100644
---- a/utils/blkmapd/device-inq.c
-+++ b/utils/blkmapd/device-inq.c
-@@ -53,7 +53,7 @@
- #define DEF_ALLOC_LEN	255
- #define MX_ALLOC_LEN	(0xc000 + 0x80)
- 
--static struct bl_serial *bl_create_scsi_string(int len, const char *bytes)
-+struct bl_serial *bl_create_scsi_string(int len, const char *bytes)
- {
- 	struct bl_serial *s;
- 
-@@ -66,7 +66,7 @@ static struct bl_serial *bl_create_scsi_string(int len, const char *bytes)
- 	return s;
- }
- 
--static void bl_free_scsi_string(struct bl_serial *str)
-+void bl_free_scsi_string(struct bl_serial *str)
- {
- 	if (str)
- 		free(str);
--- 
-2.38.1
-
diff --git a/debian/patches/fsidd-provide-better-default-socket-name.patch b/debian/patches/fsidd-provide-better-default-socket-name.patch
new file mode 100644
index 0000000..ef3b909
--- /dev/null
+++ b/debian/patches/fsidd-provide-better-default-socket-name.patch
@@ -0,0 +1,96 @@
+From: NeilBrown <[e-mail]>
+Date: Thu, 11 May 2023 14:26:47 -0400
+Subject: fsidd: provide better default socket name.
+Origin: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=e00ab3c0616fe6d83ab0710d9e7d989c299088f7
+Bug-Debian: https://bugs.debian.org/1041147
+
+Having the default socket name be in the current directory is a poor
+choice for a daemon that is expected to run as root.
+
+It is also likely better to use an "abstract" socket name.  abstract
+names do not exist in the filesystem namespace and are local to a
+network namespace.  Using an abstract name ensures that the nfsd,
+mountd, and fsidd are all in the same network namespace.
+
+This patch:
+ - uses a single #define for the default socket name, rather than 2;
+ - allows the socket name to start with '@' which is interpreted to
+   be a request to use the abstract name space (systemd uses the same
+   convention).
+ - changes the default to "@/run/fsid.sock".  I don't know of a formal
+   standard for choosing names in the abstract name space, the defacto
+   standard (seen in "ss -xa|grep @") is to use a name similar to what
+   might be used in the filesystem.
+
+Acked-by: Richard Weinberger <[e-mail]>
+Signed-off-by: NeilBrown <[e-mail]>
+Signed-off-by: Steve Dickson <[e-mail]>
+---
+ support/reexport/fsidd.c    | 10 ++++++----
+ support/reexport/reexport.c |  3 +++
+ support/reexport/reexport.h |  2 +-
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c
+index 3fef1ef3512b..37649d065ce6 100644
+--- a/support/reexport/fsidd.c
++++ b/support/reexport/fsidd.c
+@@ -18,11 +18,10 @@
+ 
+ #include "conffile.h"
+ #include "reexport_backend.h"
++#include "reexport.h"
+ #include "xcommon.h"
+ #include "xlog.h"
+ 
+-#define FSID_SOCKET_NAME "fsid.sock"
+-
+ static struct event_base *evbase;
+ static struct reexpdb_backend_plugin *dbbackend = &sqlite_plug_ops;
+ 
+@@ -167,11 +166,14 @@ int main(void)
+ 
+ 	sock_file = conf_get_str_with_def("reexport", "fsidd_socket", FSID_SOCKET_NAME);
+ 
+-	unlink(sock_file);
+-
+ 	memset(&addr, 0, sizeof(struct sockaddr_un));
+ 	addr.sun_family = AF_UNIX;
+ 	strncpy(addr.sun_path, sock_file, sizeof(addr.sun_path) - 1);
++	if (addr.sun_path[0] == '@')
++		/* "abstract" socket namespace */
++		addr.sun_path[0] = 0;
++	else
++		unlink(sock_file);
+ 
+ 	srv = socket(AF_UNIX, SOCK_SEQPACKET | SOCK_NONBLOCK, 0);
+ 	if (srv == -1) {
+diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c
+index eddc9bf413f6..d597a2f73c93 100644
+--- a/support/reexport/reexport.c
++++ b/support/reexport/reexport.c
+@@ -38,6 +38,9 @@ static bool connect_fsid_service(void)
+ 	memset(&addr, 0, sizeof(struct sockaddr_un));
+ 	addr.sun_family = AF_UNIX;
+ 	strncpy(addr.sun_path, sock_file, sizeof(addr.sun_path) - 1);
++	if (addr.sun_path[0] == '@')
++		/* "abstract" socket namespace */
++		addr.sun_path[0] = 0;
+ 
+ 	s = socket(AF_UNIX, SOCK_SEQPACKET, 0);
+ 	if (s == -1) {
+diff --git a/support/reexport/reexport.h b/support/reexport/reexport.h
+index 3bed03a9a0bb..856c3085a1dd 100644
+--- a/support/reexport/reexport.h
++++ b/support/reexport/reexport.h
+@@ -13,6 +13,6 @@ int reexpdb_fsidnum_by_path(char *path, uint32_t *fsidnum, int may_create);
+ int reexpdb_apply_reexport_settings(struct exportent *ep, char *flname, int flline);
+ void reexpdb_uncover_subvolume(uint32_t fsidnum);
+ 
+-#define FSID_SOCKET_NAME "fsid.sock"
++#define FSID_SOCKET_NAME "@/run/fsid.sock"
+ 
+ #endif /* REEXPORT_H */
+-- 
+2.40.1
+
diff --git a/debian/patches/libnfsidmap-try-to-get-the-domain-directly-from-host.patch b/debian/patches/libnfsidmap-try-to-get-the-domain-directly-from-host.patch
new file mode 100644
index 0000000..50ca4e5
--- /dev/null
+++ b/debian/patches/libnfsidmap-try-to-get-the-domain-directly-from-host.patch
@@ -0,0 +1,54 @@
+From: Aram Akhavan <[e-mail]>
+Date: Sat, 15 Jul 2023 13:21:04 -0400
+Subject: libnfsidmap: try to get the domain directly from hostname if the DNS
+ lookup fails and always show the log message if the domain can't be
+ determined
+Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=90a23f7c6343bcb1b69c93ceccc14cc06e14d958
+
+In nfs4_init_name_mapping(), if no domain is specified in the config file, the hostname will be looked up in DNS, and the domain extracted from that.
+If DNS resolution isn't up at this time (i.e. on idmapd startup), the hardcoded domain in IDMAPD_DEFAULT_DOMAIN is used. This will break id mapping
+for anyone who doesn't happen to use "localdomain". Previously, the log message indicating this has happened requires -v to be passed, so the
+"failure" was silent by default.
+
+Signed-off-by: Aram Akhavan <[e-mail]>
+Signed-off-by: Steve Dickson <[e-mail]>
+---
+ support/nfsidmap/libnfsidmap.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/support/nfsidmap/libnfsidmap.c b/support/nfsidmap/libnfsidmap.c
+index 0a912e52e1fb..f8c36480155f 100644
+--- a/support/nfsidmap/libnfsidmap.c
++++ b/support/nfsidmap/libnfsidmap.c
+@@ -219,10 +219,15 @@ static int domain_from_dns(char **domain)
+ 
+ 	if (gethostname(hname, sizeof(hname)) == -1)
+ 		return -1;
+-	if ((he = gethostbyname(hname)) == NULL)
+-		return -1;
+-	if ((c = strchr(he->h_name, '.')) == NULL || *++c == '\0')
+-		return -1;
++	if ((he = gethostbyname(hname)) == NULL) {
++		IDMAP_LOG(1, ("libnfsidmap: DNS lookup of hostname failed. Attempting to use domain from hostname as is."));
++		if ((c = strchr(hname, '.')) == NULL || *++c == '\0')
++			return -1;
++	}
++	else {
++		if ((c = strchr(he->h_name, '.')) == NULL || *++c == '\0')
++			return -1;
++	}
+ 	/* 
+ 	 * Query DNS to see if the _nfsv4idmapdomain TXT record exists
+ 	 * If so use it... 
+@@ -387,7 +392,7 @@ int nfs4_init_name_mapping(char *conffile)
+ 		dflt = 1;
+ 		ret = domain_from_dns(&default_domain);
+ 		if (ret) {
+-			IDMAP_LOG(1, ("libnfsidmap: Unable to determine "
++			IDMAP_LOG(0, ("libnfsidmap: Unable to determine "
+ 				  "the NFSv4 domain; Using '%s' as the NFSv4 domain "
+ 				  "which means UIDs will be mapped to the 'Nobody-User' "
+ 				  "user defined in %s", 
+-- 
+2.40.1
+
diff --git a/debian/patches/nfs-idmapd.service-add-network-online.target-to-Want.patch b/debian/patches/nfs-idmapd.service-add-network-online.target-to-Want.patch
new file mode 100644
index 0000000..6572d70
--- /dev/null
+++ b/debian/patches/nfs-idmapd.service-add-network-online.target-to-Want.patch
@@ -0,0 +1,33 @@
+From: Aram Akhavan <[e-mail]>
+Date: Sat, 15 Jul 2023 13:16:58 -0400
+Subject: nfs-idmapd.service: add network-online.target to Wants= and After=
+Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f5e66718c01f89b28bf9e7a8c645d9e18682485
+Bug-Debian: https://bugs.debian.org/1035840
+
+nfs-idmapd.service does not have any dependency on the network so there's no
+starting point to wait for DNS resolution. nfs-server.service already has this
+network dependency and ordering.
+
+Signed-off-by: Aram Akhavan <[e-mail]>
+Signed-off-by: Steve Dickson <[e-mail]>
+---
+ systemd/nfs-idmapd.service | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/systemd/nfs-idmapd.service b/systemd/nfs-idmapd.service
+index f38fe527237e..198ca87c2bc9 100644
+--- a/systemd/nfs-idmapd.service
++++ b/systemd/nfs-idmapd.service
+@@ -2,7 +2,8 @@
+ Description=NFSv4 ID-name mapping service
+ DefaultDependencies=no
+ Requires=rpc_pipefs.target
+-After=rpc_pipefs.target local-fs.target
++After=rpc_pipefs.target local-fs.target network-online.target
++Wants=network-online.target
+ 
+ BindsTo=nfs-server.service
+ 
+-- 
+2.40.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 60ba4c9..2046770 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 01-sm-notify-in-sbin.patch
 25-systemd-daemon-paths.patch
 multiarch-kerberos-paths.patch
+<<<<<<< debian/patches/series
 ubuntu-idmapd-manpage-update-regex-other-package.patch
 nfs-conf-manpage-missing-svcgssd-options.patch
 always-run-generator.patch
@@ -11,3 +12,12 @@ Revert-systemd-Apply-all-sysctl-settings-when-NFS-re.patch
 systemd-Apply-all-sysctl-settings-through-udev-rule-.patch
 auth-rpcgss-module.service-Don-t-fail-inside-linux-c.patch
 systemd-Don-t-degrade-system-state-for-nfs-clients-w.patch
+=======
+always-run-generator.patch
+start-statd-fix-shellcheck-warnings.patch
+fsidd-provide-better-default-socket-name.patch
+nfs-idmapd.service-add-network-online.target-to-Want.patch
+libnfsidmap-try-to-get-the-domain-directly-from-host.patch
+ubuntu-idmapd-manpage-update-regex-other-package.patch
+nfs-conf-manpage-missing-svcgssd-options.patch
+>>>>>>> debian/patches/series
diff --git a/debian/patches/start-statd-fix-shellcheck-warnings.patch b/debian/patches/start-statd-fix-shellcheck-warnings.patch
new file mode 100644
index 0000000..e4f383d
--- /dev/null
+++ b/debian/patches/start-statd-fix-shellcheck-warnings.patch
@@ -0,0 +1,41 @@
+From: Ben Hutchings <[e-mail]>
+Date: Tue, 13 Jun 2023 03:56:03 +0200
+Subject: start-statd: Fix shellcheck warnings
+
+shellcheck currently complains:
+
+In utils/statd/start-statd line 14:
+       [ 1`cat /run/rpc.statd.pid` -gt 1 ] &&
+          ^----------------------^ SC2046 (warning): Quote this to prevent word splitting.
+          ^----------------------^ SC2006 (style): Use $(...) notation instead of legacy backticks `...`.
+
+Did you mean:
+       [ 1$(cat /run/rpc.statd.pid) -gt 1 ] &&
+
+
+In utils/statd/start-statd line 15:
+       kill -0 `cat /run/rpc.statd.pid` > /dev/null 2>&1
+               ^----------------------^ SC2046 (warning): Quote this to prevent word splitting.
+               ^----------------------^ SC2006 (style): Use $(...) notation instead of legacy backticks `...`.
+
+Did you mean:
+       kill -0 $(cat /run/rpc.statd.pid) > /dev/null 2>&1
+
+Use quotes and $() as recommended.
+
+Signed-off-by: Ben Hutchings <[e-mail]>
+---
+
+--- a/utils/statd/start-statd
++++ b/utils/statd/start-statd
+@@ -11,8 +11,8 @@ exec 9> /run/rpc.statd.lock
+ flock -e 9
+ 
+ if [ -s /run/rpc.statd.pid ] &&
+-       [ 1`cat /run/rpc.statd.pid` -gt 1 ] &&
+-       kill -0 `cat /run/rpc.statd.pid` > /dev/null 2>&1
++       [ "1$(cat /run/rpc.statd.pid)" -gt 1 ] &&
++       kill -0 "$(cat /run/rpc.statd.pid)" > /dev/null 2>&1
+ then
+     # statd already running - must have been slow to respond.
+     exit 0
diff --git a/debian/patches/systemd-Apply-all-sysctl-settings-through-udev-rule-.patch b/debian/patches/systemd-Apply-all-sysctl-settings-through-udev-rule-.patch
deleted file mode 100644
index b2230cc..0000000
--- a/debian/patches/systemd-Apply-all-sysctl-settings-through-udev-rule-.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 9466df03394a48cc08aa4bcdcfda3fe6cd074468 Mon Sep 17 00:00:00 2001
-From: Salvatore Bonaccorso <[e-mail]>
-Date: Mon, 5 Dec 2022 15:51:34 -0500
-Subject: [PATCH 4/4] systemd: Apply all sysctl settings through udev rule when
- NFS-related modules are loaded
-
-sysctl settings (e.g.  /etc/sysctl.conf and others) are normally loaded
-once at boot.  If the module that implements some settings is no yet
-loaded, those settings don't get applied.
-
-Various NFS modules support various sysctl settings.  If they are loaded
-after boot, they miss out.
-
-Add a new udev rule configuration to udev/rules.d/60-nfs.rules to apply
-the relevant settings when the modules are loaded.
-
-Placing it in the systemd directory similarly as the choice for the
-original commit afc7132dfb21 ("systemd: Apply all sysctl settings when
-NFS-related modules are loaded").
-
-Link: https://lore.kernel.org/linux-nfs/[e-mail]/
-Link: https://bugs.debian.org/1022172
-Link: https://bugs.debian.org/1024082
-Suggested-by: Marco d'Itri <[e-mail]>
-Signed-off-by: Salvatore Bonaccorso <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- systemd/60-nfs.rules | 21 +++++++++++++++++++++
- systemd/Makefile.am  |  9 +++++++--
- 2 files changed, 28 insertions(+), 2 deletions(-)
- create mode 100644 systemd/60-nfs.rules
-
-diff --git a/systemd/60-nfs.rules b/systemd/60-nfs.rules
-new file mode 100644
-index 000000000000..188423c1d2e3
---- /dev/null
-+++ b/systemd/60-nfs.rules
-@@ -0,0 +1,21 @@
-+# Ensure all NFS systctl settings get applied when modules load
-+
-+# sunrpc module supports "sunrpc.*" sysctls
-+ACTION=="add", SUBSYSTEM=="module", KERNEL=="sunrpc", \
-+  RUN+="/sbin/sysctl -q --pattern ^sunrpc --system"
-+
-+# rpcrdma module supports sunrpc.svc_rdma.*
-+ACTION=="add", SUBSYSTEM=="module", KERNEL=="rpcrdma", \
-+  RUN+="/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system"
-+
-+# lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls
-+ACTION=="add", SUBSYSTEM=="module", KERNEL=="lockd", \
-+  RUN+="/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system"
-+
-+# nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout)
-+ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfsv4", \
-+  RUN+="/sbin/sysctl -q --pattern ^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system"
-+
-+# nfs module supports "fs.nfs.*" sysctls
-+ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfs", \
-+  RUN+="/sbin/sysctl -q --pattern ^fs.nfs --system"
-diff --git a/systemd/Makefile.am b/systemd/Makefile.am
-index e7f5d818a913..577c6a2286c0 100644
---- a/systemd/Makefile.am
-+++ b/systemd/Makefile.am
-@@ -2,6 +2,9 @@
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
-+udev_rulesdir = /usr/lib/udev/rules.d/
-+udev_files = 60-nfs.rules
-+
- unit_files =  \
-     nfs-client.target \
-     rpc_pipefs.target \
-@@ -51,7 +54,7 @@ endif
- 
- man5_MANS	= nfs.conf.man
- man7_MANS	= nfs.systemd.man
--EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)
-+EXTRA_DIST = $(unit_files) $(udev_files) $(man5_MANS) $(man7_MANS)
- 
- generator_dir = $(unitdir)/../system-generators
- 
-@@ -73,8 +76,10 @@ rpc_pipefs_generator_LDADD = ../support/nfs/libnfs.la
- 
- if INSTALL_SYSTEMD
- genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator
--install-data-hook: $(unit_files)
-+install-data-hook: $(unit_files) $(udev_files)
- 	mkdir -p $(DESTDIR)/$(unitdir)
- 	cp $(unit_files) $(DESTDIR)/$(unitdir)
- 	cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount)
-+	mkdir -p $(DESTDIR)/$(udev_rulesdir)
-+	cp $(udev_files) $(DESTDIR)/$(udev_rulesdir)
- endif
--- 
-2.38.1
-
diff --git a/debian/patches/systemd-Don-t-degrade-system-state-for-nfs-clients-w.patch b/debian/patches/systemd-Don-t-degrade-system-state-for-nfs-clients-w.patch
deleted file mode 100644
index 15548bd..0000000
--- a/debian/patches/systemd-Don-t-degrade-system-state-for-nfs-clients-w.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Joachim Falk <[e-mail]>
-Date: Tue, 10 Jan 2023 09:55:59 -0500
-Subject: systemd: Don't degrade system state for nfs-clients when krb5 keytab
- present but not containing the nfs/<FQDN> principal
-Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5faf98a62843d1cda2a0fe15e0878fa1281e42b8
-Bug-Debian: https://bugs.debian.org/985002
-
-The nfs-client.target requires the auth-rpcgss-module.service, which in
-turn requires the rpc-svcgssd.service. However, the rpc.svcgssd daemon
-is unnecessary for an NFS client, even when using Kerberos security.
-Moreover, starting this daemon with its default configuration will fail
-when no nfs/<host>@REALM principal is in the Kerberos keytab. Thus,
-resulting in a degraded system state for NFS client configurations
-without nfs/<host>@REALM principal in the Kerberos keytab. However, this
-is a perfectly valid NFS client configuration as the nfs/<host>@REALM
-principal is not required for mounting NFS file systems. This is even
-the case when Kerberos security is enabled for the mount!
-
-Installing the gssproxy package hides this problem as this disables the
-rpc-svcgssd.service.
-
-Link: http://bugs.debian.org/985002
-Link: https://salsa.debian.org/kernel-team/nfs-utils/-/merge_requests/23
-
-Signed-off-by: Joachim Falk <[e-mail]>
-Signed-off-by: Steve Dickson <[e-mail]>
----
- systemd/auth-rpcgss-module.service | 2 +-
- systemd/nfs-server.service         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/systemd/auth-rpcgss-module.service b/systemd/auth-rpcgss-module.service
-index 25c9de8088fc..4a69a7b77b03 100644
---- a/systemd/auth-rpcgss-module.service
-+++ b/systemd/auth-rpcgss-module.service
-@@ -8,7 +8,7 @@
- Description=Kernel Module supporting RPCSEC_GSS
- DefaultDependencies=no
- Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service
--Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service
-+Wants=gssproxy.service rpc-gssd.service
- ConditionPathExists=/etc/krb5.keytab
- ConditionVirtualization=!container
- 
-diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
-index b432f9102d0c..2cdd786841ea 100644
---- a/systemd/nfs-server.service
-+++ b/systemd/nfs-server.service
-@@ -15,7 +15,7 @@ After=nfsdcld.service
- Before=rpc-statd-notify.service
- 
- # GSS services dependencies and ordering
--Wants=auth-rpcgss-module.service
-+Wants=auth-rpcgss-module.service rpc-svcgssd.service
- After=rpc-gssd.service gssproxy.service rpc-svcgssd.service
- 
- [Service]
--- 
-2.39.0
-
diff --git a/debian/rules b/debian/rules
index fcc473d..1bfc0d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,9 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# set and export all variables from dpkg-architecture
+# and using DEB_HOST_MULTIARCH
+include /usr/share/dpkg/architecture.mk
 
 %:
 	dh $@ --with apport
@@ -29,6 +31,10 @@ override_dh_fixperms:
 
 override_dh_install:
 	# we will let the generator produce these units, see LP: #1971935
+<<<<<<< debian/rules
+=======
+	# and https://bugs.debian.org/1014429
+>>>>>>> debian/rules
 	dh_install -Xvar-lib-nfs-rpc_pipefs.mount -Xrpc_pipefs.target
 
 override_dh_installinit:
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 30caef7..bfbe59b 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -8,3 +8,17 @@ variables:
   SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 'true'
   # Currently triggering falsely (bugs #973313, #1000977)
   SALSA_CI_LINTIAN_SUPPRESS_TAGS: 'groff-message,elf-error'
+
+shellcheck:
+  stage: test
+  image: $SALSA_CI_IMAGES_BASE
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null
+  script:
+    - apt-get update
+    - apt-get install -y quilt shellcheck
+    - QUILT_PATCHES=debian/patches quilt push -a
+    - |
+        shellcheck -e SC1090,SC1091 utils/statd/start-statd $(find debian -maxdepth 1 -type f | xargs grep -El '^#!/bin/(ba|da)?sh')
+  needs: []
diff --git a/linux-nfs/Makefile.in b/linux-nfs/Makefile.in
index 8dee515..037331c 100644
--- a/linux-nfs/Makefile.in
+++ b/linux-nfs/Makefile.in
@@ -207,6 +207,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -308,7 +310,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/Makefile.am b/support/Makefile.am
index c962d4d..07cfd87 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -10,7 +10,7 @@ if CONFIG_JUNCTION
 OPTDIRS += junction
 endif
 
-SUBDIRS = export include misc nfs nsm $(OPTDIRS)
+SUBDIRS = export include misc nfs nsm reexport $(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/support/Makefile.in b/support/Makefile.in
index 7c438c3..86c5e97 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -166,7 +166,7 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-DIST_SUBDIRS = export include misc nfs nsm nfsidmap junction
+DIST_SUBDIRS = export include misc nfs nsm reexport nfsidmap junction
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -266,6 +266,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -367,7 +369,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
@@ -391,7 +392,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 unitdir = @unitdir@
 OPTDIRS = $(am__append_1) $(am__append_2)
-SUBDIRS = export include misc nfs nsm $(OPTDIRS)
+SUBDIRS = export include misc nfs nsm reexport $(OPTDIRS)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
diff --git a/support/export/Makefile.am b/support/export/Makefile.am
index eec737f..7338e1c 100644
--- a/support/export/Makefile.am
+++ b/support/export/Makefile.am
@@ -14,6 +14,8 @@ libexport_a_SOURCES = client.c export.c hostname.c \
 		      xtab.c mount_clnt.c mount_xdr.c \
 		      cache.c auth.c v4root.c fsloc.c \
 		      v4clients.c
+libexport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) -I$(top_srcdir)/support/reexport
+
 BUILT_SOURCES 	= $(GENFILES)
 
 noinst_HEADERS = mount.h
diff --git a/support/export/Makefile.in b/support/export/Makefile.in
index 51ce717..e9d5f1b 100644
--- a/support/export/Makefile.in
+++ b/support/export/Makefile.in
@@ -123,10 +123,12 @@ am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libexport_a_AR = $(AR) $(ARFLAGS)
 libexport_a_LIBADD =
-am_libexport_a_OBJECTS = client.$(OBJEXT) export.$(OBJEXT) \
-	hostname.$(OBJEXT) xtab.$(OBJEXT) mount_clnt.$(OBJEXT) \
-	mount_xdr.$(OBJEXT) cache.$(OBJEXT) auth.$(OBJEXT) \
-	v4root.$(OBJEXT) fsloc.$(OBJEXT) v4clients.$(OBJEXT)
+am_libexport_a_OBJECTS = libexport_a-client.$(OBJEXT) \
+	libexport_a-export.$(OBJEXT) libexport_a-hostname.$(OBJEXT) \
+	libexport_a-xtab.$(OBJEXT) libexport_a-mount_clnt.$(OBJEXT) \
+	libexport_a-mount_xdr.$(OBJEXT) libexport_a-cache.$(OBJEXT) \
+	libexport_a-auth.$(OBJEXT) libexport_a-v4root.$(OBJEXT) \
+	libexport_a-fsloc.$(OBJEXT) libexport_a-v4clients.$(OBJEXT)
 libexport_a_OBJECTS = $(am_libexport_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -143,19 +145,24 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/auth.Po ./$(DEPDIR)/cache.Po \
-	./$(DEPDIR)/client.Po ./$(DEPDIR)/export.Po \
-	./$(DEPDIR)/fsloc.Po ./$(DEPDIR)/hostname.Po \
-	./$(DEPDIR)/mount_clnt.Po ./$(DEPDIR)/mount_xdr.Po \
-	./$(DEPDIR)/v4clients.Po ./$(DEPDIR)/v4root.Po \
-	./$(DEPDIR)/xtab.Po
+am__depfiles_remade = ./$(DEPDIR)/libexport_a-auth.Po \
+	./$(DEPDIR)/libexport_a-cache.Po \
+	./$(DEPDIR)/libexport_a-client.Po \
+	./$(DEPDIR)/libexport_a-export.Po \
+	./$(DEPDIR)/libexport_a-fsloc.Po \
+	./$(DEPDIR)/libexport_a-hostname.Po \
+	./$(DEPDIR)/libexport_a-mount_clnt.Po \
+	./$(DEPDIR)/libexport_a-mount_xdr.Po \
+	./$(DEPDIR)/libexport_a-v4clients.Po \
+	./$(DEPDIR)/libexport_a-v4root.Po \
+	./$(DEPDIR)/libexport_a-xtab.Po
 am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
@@ -271,6 +278,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -372,7 +381,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
@@ -406,6 +414,7 @@ libexport_a_SOURCES = client.c export.c hostname.c \
 		      cache.c auth.c v4root.c fsloc.c \
 		      v4clients.c
 
+libexport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) -I$(top_srcdir)/support/reexport
 BUILT_SOURCES = $(GENFILES)
 noinst_HEADERS = mount.h
 @CONFIG_RPCGEN_FALSE@RPCGEN = @RPCGEN_PATH@
@@ -461,17 +470,17 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/export.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsloc.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostname.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_clnt.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_xdr.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v4clients.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v4root.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtab.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-auth.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-cache.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-export.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-fsloc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-hostname.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-mount_clnt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-mount_xdr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-v4clients.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-v4root.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexport_a-xtab.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -500,6 +509,160 @@ am--depfiles: $(am__depfiles_remade)
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+libexport_a-client.o: client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-client.o -MD -MP -MF $(DEPDIR)/libexport_a-client.Tpo -c -o libexport_a-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-client.Tpo $(DEPDIR)/libexport_a-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='client.c' object='libexport_a-client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c
+
+libexport_a-client.obj: client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-client.obj -MD -MP -MF $(DEPDIR)/libexport_a-client.Tpo -c -o libexport_a-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-client.Tpo $(DEPDIR)/libexport_a-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='client.c' object='libexport_a-client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'; fi`
+
+libexport_a-export.o: export.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-export.o -MD -MP -MF $(DEPDIR)/libexport_a-export.Tpo -c -o libexport_a-export.o `test -f 'export.c' || echo '$(srcdir)/'`export.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-export.Tpo $(DEPDIR)/libexport_a-export.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='export.c' object='libexport_a-export.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-export.o `test -f 'export.c' || echo '$(srcdir)/'`export.c
+
+libexport_a-export.obj: export.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-export.obj -MD -MP -MF $(DEPDIR)/libexport_a-export.Tpo -c -o libexport_a-export.obj `if test -f 'export.c'; then $(CYGPATH_W) 'export.c'; else $(CYGPATH_W) '$(srcdir)/export.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-export.Tpo $(DEPDIR)/libexport_a-export.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='export.c' object='libexport_a-export.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-export.obj `if test -f 'export.c'; then $(CYGPATH_W) 'export.c'; else $(CYGPATH_W) '$(srcdir)/export.c'; fi`
+
+libexport_a-hostname.o: hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-hostname.o -MD -MP -MF $(DEPDIR)/libexport_a-hostname.Tpo -c -o libexport_a-hostname.o `test -f 'hostname.c' || echo '$(srcdir)/'`hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-hostname.Tpo $(DEPDIR)/libexport_a-hostname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hostname.c' object='libexport_a-hostname.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-hostname.o `test -f 'hostname.c' || echo '$(srcdir)/'`hostname.c
+
+libexport_a-hostname.obj: hostname.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-hostname.obj -MD -MP -MF $(DEPDIR)/libexport_a-hostname.Tpo -c -o libexport_a-hostname.obj `if test -f 'hostname.c'; then $(CYGPATH_W) 'hostname.c'; else $(CYGPATH_W) '$(srcdir)/hostname.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-hostname.Tpo $(DEPDIR)/libexport_a-hostname.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hostname.c' object='libexport_a-hostname.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-hostname.obj `if test -f 'hostname.c'; then $(CYGPATH_W) 'hostname.c'; else $(CYGPATH_W) '$(srcdir)/hostname.c'; fi`
+
+libexport_a-xtab.o: xtab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-xtab.o -MD -MP -MF $(DEPDIR)/libexport_a-xtab.Tpo -c -o libexport_a-xtab.o `test -f 'xtab.c' || echo '$(srcdir)/'`xtab.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-xtab.Tpo $(DEPDIR)/libexport_a-xtab.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xtab.c' object='libexport_a-xtab.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-xtab.o `test -f 'xtab.c' || echo '$(srcdir)/'`xtab.c
+
+libexport_a-xtab.obj: xtab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-xtab.obj -MD -MP -MF $(DEPDIR)/libexport_a-xtab.Tpo -c -o libexport_a-xtab.obj `if test -f 'xtab.c'; then $(CYGPATH_W) 'xtab.c'; else $(CYGPATH_W) '$(srcdir)/xtab.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-xtab.Tpo $(DEPDIR)/libexport_a-xtab.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xtab.c' object='libexport_a-xtab.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-xtab.obj `if test -f 'xtab.c'; then $(CYGPATH_W) 'xtab.c'; else $(CYGPATH_W) '$(srcdir)/xtab.c'; fi`
+
+libexport_a-mount_clnt.o: mount_clnt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-mount_clnt.o -MD -MP -MF $(DEPDIR)/libexport_a-mount_clnt.Tpo -c -o libexport_a-mount_clnt.o `test -f 'mount_clnt.c' || echo '$(srcdir)/'`mount_clnt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-mount_clnt.Tpo $(DEPDIR)/libexport_a-mount_clnt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount_clnt.c' object='libexport_a-mount_clnt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-mount_clnt.o `test -f 'mount_clnt.c' || echo '$(srcdir)/'`mount_clnt.c
+
+libexport_a-mount_clnt.obj: mount_clnt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-mount_clnt.obj -MD -MP -MF $(DEPDIR)/libexport_a-mount_clnt.Tpo -c -o libexport_a-mount_clnt.obj `if test -f 'mount_clnt.c'; then $(CYGPATH_W) 'mount_clnt.c'; else $(CYGPATH_W) '$(srcdir)/mount_clnt.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-mount_clnt.Tpo $(DEPDIR)/libexport_a-mount_clnt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount_clnt.c' object='libexport_a-mount_clnt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-mount_clnt.obj `if test -f 'mount_clnt.c'; then $(CYGPATH_W) 'mount_clnt.c'; else $(CYGPATH_W) '$(srcdir)/mount_clnt.c'; fi`
+
+libexport_a-mount_xdr.o: mount_xdr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-mount_xdr.o -MD -MP -MF $(DEPDIR)/libexport_a-mount_xdr.Tpo -c -o libexport_a-mount_xdr.o `test -f 'mount_xdr.c' || echo '$(srcdir)/'`mount_xdr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-mount_xdr.Tpo $(DEPDIR)/libexport_a-mount_xdr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount_xdr.c' object='libexport_a-mount_xdr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-mount_xdr.o `test -f 'mount_xdr.c' || echo '$(srcdir)/'`mount_xdr.c
+
+libexport_a-mount_xdr.obj: mount_xdr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-mount_xdr.obj -MD -MP -MF $(DEPDIR)/libexport_a-mount_xdr.Tpo -c -o libexport_a-mount_xdr.obj `if test -f 'mount_xdr.c'; then $(CYGPATH_W) 'mount_xdr.c'; else $(CYGPATH_W) '$(srcdir)/mount_xdr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-mount_xdr.Tpo $(DEPDIR)/libexport_a-mount_xdr.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mount_xdr.c' object='libexport_a-mount_xdr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-mount_xdr.obj `if test -f 'mount_xdr.c'; then $(CYGPATH_W) 'mount_xdr.c'; else $(CYGPATH_W) '$(srcdir)/mount_xdr.c'; fi`
+
+libexport_a-cache.o: cache.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-cache.o -MD -MP -MF $(DEPDIR)/libexport_a-cache.Tpo -c -o libexport_a-cache.o `test -f 'cache.c' || echo '$(srcdir)/'`cache.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-cache.Tpo $(DEPDIR)/libexport_a-cache.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cache.c' object='libexport_a-cache.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-cache.o `test -f 'cache.c' || echo '$(srcdir)/'`cache.c
+
+libexport_a-cache.obj: cache.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-cache.obj -MD -MP -MF $(DEPDIR)/libexport_a-cache.Tpo -c -o libexport_a-cache.obj `if test -f 'cache.c'; then $(CYGPATH_W) 'cache.c'; else $(CYGPATH_W) '$(srcdir)/cache.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-cache.Tpo $(DEPDIR)/libexport_a-cache.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cache.c' object='libexport_a-cache.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-cache.obj `if test -f 'cache.c'; then $(CYGPATH_W) 'cache.c'; else $(CYGPATH_W) '$(srcdir)/cache.c'; fi`
+
+libexport_a-auth.o: auth.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-auth.o -MD -MP -MF $(DEPDIR)/libexport_a-auth.Tpo -c -o libexport_a-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-auth.Tpo $(DEPDIR)/libexport_a-auth.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='auth.c' object='libexport_a-auth.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
+
+libexport_a-auth.obj: auth.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-auth.obj -MD -MP -MF $(DEPDIR)/libexport_a-auth.Tpo -c -o libexport_a-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-auth.Tpo $(DEPDIR)/libexport_a-auth.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='auth.c' object='libexport_a-auth.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`
+
+libexport_a-v4root.o: v4root.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-v4root.o -MD -MP -MF $(DEPDIR)/libexport_a-v4root.Tpo -c -o libexport_a-v4root.o `test -f 'v4root.c' || echo '$(srcdir)/'`v4root.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-v4root.Tpo $(DEPDIR)/libexport_a-v4root.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='v4root.c' object='libexport_a-v4root.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-v4root.o `test -f 'v4root.c' || echo '$(srcdir)/'`v4root.c
+
+libexport_a-v4root.obj: v4root.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-v4root.obj -MD -MP -MF $(DEPDIR)/libexport_a-v4root.Tpo -c -o libexport_a-v4root.obj `if test -f 'v4root.c'; then $(CYGPATH_W) 'v4root.c'; else $(CYGPATH_W) '$(srcdir)/v4root.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-v4root.Tpo $(DEPDIR)/libexport_a-v4root.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='v4root.c' object='libexport_a-v4root.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-v4root.obj `if test -f 'v4root.c'; then $(CYGPATH_W) 'v4root.c'; else $(CYGPATH_W) '$(srcdir)/v4root.c'; fi`
+
+libexport_a-fsloc.o: fsloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-fsloc.o -MD -MP -MF $(DEPDIR)/libexport_a-fsloc.Tpo -c -o libexport_a-fsloc.o `test -f 'fsloc.c' || echo '$(srcdir)/'`fsloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-fsloc.Tpo $(DEPDIR)/libexport_a-fsloc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fsloc.c' object='libexport_a-fsloc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-fsloc.o `test -f 'fsloc.c' || echo '$(srcdir)/'`fsloc.c
+
+libexport_a-fsloc.obj: fsloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-fsloc.obj -MD -MP -MF $(DEPDIR)/libexport_a-fsloc.Tpo -c -o libexport_a-fsloc.obj `if test -f 'fsloc.c'; then $(CYGPATH_W) 'fsloc.c'; else $(CYGPATH_W) '$(srcdir)/fsloc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-fsloc.Tpo $(DEPDIR)/libexport_a-fsloc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fsloc.c' object='libexport_a-fsloc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-fsloc.obj `if test -f 'fsloc.c'; then $(CYGPATH_W) 'fsloc.c'; else $(CYGPATH_W) '$(srcdir)/fsloc.c'; fi`
+
+libexport_a-v4clients.o: v4clients.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-v4clients.o -MD -MP -MF $(DEPDIR)/libexport_a-v4clients.Tpo -c -o libexport_a-v4clients.o `test -f 'v4clients.c' || echo '$(srcdir)/'`v4clients.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-v4clients.Tpo $(DEPDIR)/libexport_a-v4clients.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='v4clients.c' object='libexport_a-v4clients.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-v4clients.o `test -f 'v4clients.c' || echo '$(srcdir)/'`v4clients.c
+
+libexport_a-v4clients.obj: v4clients.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexport_a-v4clients.obj -MD -MP -MF $(DEPDIR)/libexport_a-v4clients.Tpo -c -o libexport_a-v4clients.obj `if test -f 'v4clients.c'; then $(CYGPATH_W) 'v4clients.c'; else $(CYGPATH_W) '$(srcdir)/v4clients.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libexport_a-v4clients.Tpo $(DEPDIR)/libexport_a-v4clients.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='v4clients.c' object='libexport_a-v4clients.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexport_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexport_a-v4clients.obj `if test -f 'v4clients.c'; then $(CYGPATH_W) 'v4clients.c'; else $(CYGPATH_W) '$(srcdir)/v4clients.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -639,17 +802,17 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/auth.Po
-	-rm -f ./$(DEPDIR)/cache.Po
-	-rm -f ./$(DEPDIR)/client.Po
-	-rm -f ./$(DEPDIR)/export.Po
-	-rm -f ./$(DEPDIR)/fsloc.Po
-	-rm -f ./$(DEPDIR)/hostname.Po
-	-rm -f ./$(DEPDIR)/mount_clnt.Po
-	-rm -f ./$(DEPDIR)/mount_xdr.Po
-	-rm -f ./$(DEPDIR)/v4clients.Po
-	-rm -f ./$(DEPDIR)/v4root.Po
-	-rm -f ./$(DEPDIR)/xtab.Po
+		-rm -f ./$(DEPDIR)/libexport_a-auth.Po
+	-rm -f ./$(DEPDIR)/libexport_a-cache.Po
+	-rm -f ./$(DEPDIR)/libexport_a-client.Po
+	-rm -f ./$(DEPDIR)/libexport_a-export.Po
+	-rm -f ./$(DEPDIR)/libexport_a-fsloc.Po
+	-rm -f ./$(DEPDIR)/libexport_a-hostname.Po
+	-rm -f ./$(DEPDIR)/libexport_a-mount_clnt.Po
+	-rm -f ./$(DEPDIR)/libexport_a-mount_xdr.Po
+	-rm -f ./$(DEPDIR)/libexport_a-v4clients.Po
+	-rm -f ./$(DEPDIR)/libexport_a-v4root.Po
+	-rm -f ./$(DEPDIR)/libexport_a-xtab.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -695,17 +858,17 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/auth.Po
-	-rm -f ./$(DEPDIR)/cache.Po
-	-rm -f ./$(DEPDIR)/client.Po
-	-rm -f ./$(DEPDIR)/export.Po
-	-rm -f ./$(DEPDIR)/fsloc.Po
-	-rm -f ./$(DEPDIR)/hostname.Po
-	-rm -f ./$(DEPDIR)/mount_clnt.Po
-	-rm -f ./$(DEPDIR)/mount_xdr.Po
-	-rm -f ./$(DEPDIR)/v4clients.Po
-	-rm -f ./$(DEPDIR)/v4root.Po
-	-rm -f ./$(DEPDIR)/xtab.Po
+		-rm -f ./$(DEPDIR)/libexport_a-auth.Po
+	-rm -f ./$(DEPDIR)/libexport_a-cache.Po
+	-rm -f ./$(DEPDIR)/libexport_a-client.Po
+	-rm -f ./$(DEPDIR)/libexport_a-export.Po
+	-rm -f ./$(DEPDIR)/libexport_a-fsloc.Po
+	-rm -f ./$(DEPDIR)/libexport_a-hostname.Po
+	-rm -f ./$(DEPDIR)/libexport_a-mount_clnt.Po
+	-rm -f ./$(DEPDIR)/libexport_a-mount_xdr.Po
+	-rm -f ./$(DEPDIR)/libexport_a-v4clients.Po
+	-rm -f ./$(DEPDIR)/libexport_a-v4root.Po
+	-rm -f ./$(DEPDIR)/libexport_a-xtab.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/support/export/auth.c b/support/export/auth.c
index 03ce4b8..2d7960f 100644
--- a/support/export/auth.c
+++ b/support/export/auth.c
@@ -82,7 +82,7 @@ check_useipaddr(void)
 }
 
 unsigned int
-auth_reload()
+auth_reload(void)
 {
 	struct stat		stb;
 	static ino_t		last_inode;
diff --git a/support/export/cache.c b/support/export/cache.c
index a5823e9..19bbba5 100644
--- a/support/export/cache.c
+++ b/support/export/cache.c
@@ -33,6 +33,7 @@
 #include "export.h"
 #include "pseudoflavors.h"
 #include "xcommon.h"
+#include "reexport.h"
 
 #ifdef HAVE_JUNCTION_SUPPORT
 #include "fsloc.h"
@@ -235,6 +236,16 @@ static void auth_unix_gid(int f)
 		xlog(L_ERROR, "auth_unix_gid: error writing reply");
 }
 
+static int match_crossmnt_fsidnum(uint32_t parsed_fsidnum, char *path)
+{
+	uint32_t fsidnum;
+
+	if (reexpdb_fsidnum_by_path(path, &fsidnum, 0) == 0)
+		return 0;
+
+	return fsidnum == parsed_fsidnum;
+}
+
 #ifdef USE_BLKID
 static const char *get_uuid_blkdev(char *path)
 {
@@ -346,27 +357,27 @@ static int uuid_by_path(char *path, int type, size_t uuidlen, char *uuid)
 
 	/* Possible sources of uuid are
 	 * - blkid uuid
-	 * - statfs64 uuid
+	 * - statfs uuid
 	 *
-	 * On some filesystems (e.g. vfat) the statfs64 uuid is simply an
+	 * On some filesystems (e.g. vfat) the statfs uuid is simply an
 	 * encoding of the device that the filesystem is mounted from, so
 	 * it we be very bad to use that (as device numbers change).  blkid
 	 * must be preferred.
-	 * On other filesystems (e.g. btrfs) the statfs64 uuid contains
+	 * On other filesystems (e.g. btrfs) the statfs uuid contains
 	 * important info that the blkid uuid cannot contain:  This happens
 	 * when multiple subvolumes are exported (they have the same
-	 * blkid uuid but different statfs64 uuids).
+	 * blkid uuid but different statfs uuids).
 	 * We rely on get_uuid_blkdev *knowing* which is which and not returning
-	 * a uuid for filesystems where the statfs64 uuid is better.
+	 * a uuid for filesystems where the statfs uuid is better.
 	 *
 	 */
-	struct statfs64 st;
+	struct statfs st;
 	char fsid_val[17];
 	const char *blkid_val = NULL;
 	const char *val;
 	int rc;
 
-	rc = nfsd_path_statfs64(path, &st);
+	rc = nfsd_path_statfs(path, &st);
 
 	if (type == 0 && rc == 0) {
 		const unsigned long *bad;
@@ -410,12 +421,16 @@ static char *next_mnt(void **v, char *p)
 		*v = f;
 	} else
 		f = *v;
-	while ((me = getmntent(f)) != NULL && l > 1) {
+	while ((me = getmntent(f)) != NULL && l >= 1) {
 		char *mnt_dir = nfsd_path_strip_root(me->mnt_dir);
 
 		if (!mnt_dir)
 			continue;
 
+		/* Everything below "/" is a proper sub-mount */
+		if (strcmp(p, "/") == 0)
+			return mnt_dir;
+
 		if (strncmp(mnt_dir, p, l) == 0 && mnt_dir[l] == '/')
 			return mnt_dir;
 	}
@@ -684,8 +699,13 @@ static int match_fsid(struct parsed_fsid *parsed, nfs_export *exp, char *path)
 		goto match;
 	case FSID_NUM:
 		if (((exp->m_export.e_flags & NFSEXP_FSID) == 0 ||
-		     exp->m_export.e_fsid != parsed->fsidnum))
+		     exp->m_export.e_fsid != parsed->fsidnum)) {
+			if ((exp->m_export.e_flags & NFSEXP_CROSSMOUNT) && exp->m_export.e_reexport != REEXP_NONE &&
+			    match_crossmnt_fsidnum(parsed->fsidnum, path))
+				goto match;
+
 			goto nomatch;
+		}
 		goto match;
 	case FSID_UUID4_INUM:
 	case FSID_UUID16_INUM:
@@ -758,6 +778,7 @@ static void nfsd_fh(int f)
 	int dev_missing = 0;
 	char buf[RPC_CHAN_BUF_SIZE], *bp;
 	int blen;
+	int did_uncover = 0;
 
 	blen = cache_read(f, buf, sizeof(buf));
 	if (blen <= 0 || buf[blen-1] != '\n') return;
@@ -795,6 +816,11 @@ static void nfsd_fh(int f)
 		for (exp = exportlist[i].p_head; exp; exp = next_exp) {
 			char *path;
 
+			if (!did_uncover && parsed.fsidnum && parsed.fsidtype == FSID_NUM && exp->m_export.e_reexport != REEXP_NONE) {
+				reexpdb_uncover_subvolume(parsed.fsidnum);
+				did_uncover = 1;
+			}
+
 			if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) {
 				static nfs_export *prev = NULL;
 				static void *mnt = NULL;
@@ -932,7 +958,8 @@ static void write_fsloc(char **bp, int *blen, struct exportent *ep)
 	release_replicas(servers);
 }
 #endif
-static void write_secinfo(char **bp, int *blen, struct exportent *ep, int flag_mask)
+
+static void write_secinfo(char **bp, int *blen, struct exportent *ep, int flag_mask, int extra_flag)
 {
 	struct sec_entry *p;
 
@@ -947,9 +974,31 @@ static void write_secinfo(char **bp, int *blen, struct exportent *ep, int flag_m
 	qword_addint(bp, blen, p - ep->e_secinfo);
 	for (p = ep->e_secinfo; p->flav; p++) {
 		qword_addint(bp, blen, p->flav->fnum);
-		qword_addint(bp, blen, p->flags & flag_mask);
+		qword_addint(bp, blen, (p->flags | extra_flag) & flag_mask);
 	}
+}
+
+static void write_xprtsec(char **bp, int *blen, struct exportent *ep)
+{
+	struct xprtsec_entry *p;
 
+	for (p = ep->e_xprtsec; p->info; p++);
+	if (p == ep->e_xprtsec)
+		return;
+
+	qword_add(bp, blen, "xprtsec");
+	qword_addint(bp, blen, p - ep->e_xprtsec);
+	for (p = ep->e_xprtsec; p->info; p++)
+		qword_addint(bp, blen, p->info->number);
+}
+
+static int can_reexport_via_fsidnum(struct exportent *exp, struct statfs *st)
+{
+	if (st->f_type != 0x6969 /* NFS_SUPER_MAGIC */)
+		return 0;
+
+	return exp->e_reexport == REEXP_PREDEFINED_FSIDNUM ||
+	       exp->e_reexport == REEXP_AUTO_FSIDNUM;
 }
 
 static int dump_to_cache(int f, char *buf, int blen, char *domain,
@@ -968,17 +1017,48 @@ static int dump_to_cache(int f, char *buf, int blen, char *domain,
 	if (exp) {
 		int different_fs = strcmp(path, exp->e_path) != 0;
 		int flag_mask = different_fs ? ~NFSEXP_FSID : ~0;
+		int rc, do_fsidnum = 0;
+		uint32_t fsidnum = exp->e_fsid;
+
+		if (different_fs) {
+			struct statfs st;
+
+			rc = nfsd_path_statfs(path, &st);
+			if (rc) {
+				xlog(L_WARNING, "unable to statfs %s", path);
+				errno = EINVAL;
+				return -1;
+			}
+
+			if (can_reexport_via_fsidnum(exp, &st)) {
+				do_fsidnum = 1;
+				flag_mask = ~0;
+			}
+		}
 
 		qword_adduint(&bp, &blen, now + exp->e_ttl);
-		qword_addint(&bp, &blen, exp->e_flags & flag_mask);
+
+		if (do_fsidnum) {
+			uint32_t search_fsidnum = 0;
+			if (exp->e_reexport != REEXP_NONE && reexpdb_fsidnum_by_path(path, &search_fsidnum,
+			    exp->e_reexport == REEXP_AUTO_FSIDNUM) == 0) {
+				errno = EINVAL;
+				return -1;
+			}
+			fsidnum = search_fsidnum;
+			qword_addint(&bp, &blen, exp->e_flags | NFSEXP_FSID);
+		} else {
+			qword_addint(&bp, &blen, exp->e_flags & flag_mask);
+		}
+
 		qword_addint(&bp, &blen, exp->e_anonuid);
 		qword_addint(&bp, &blen, exp->e_anongid);
-		qword_addint(&bp, &blen, exp->e_fsid);
+		qword_addint(&bp, &blen, fsidnum);
 
 #ifdef HAVE_JUNCTION_SUPPORT
 		write_fsloc(&bp, &blen, exp);
 #endif
-		write_secinfo(&bp, &blen, exp, flag_mask);
+		write_secinfo(&bp, &blen, exp, flag_mask, do_fsidnum ? NFSEXP_FSID : 0);
 		if (exp->e_uuid == NULL || different_fs) {
 			char u[16];
 			if ((exp->e_flags & flag_mask & NFSEXP_FSID) == 0 &&
@@ -992,6 +1072,7 @@ static int dump_to_cache(int f, char *buf, int blen, char *domain,
 			qword_add(&bp, &blen, "uuid");
 			qword_addhex(&bp, &blen, u, 16);
 		}
+		write_xprtsec(&bp, &blen, exp);
 		xlog(D_AUTH, "granted access to %s for %s",
 		     path, *domain == '$' ? domain+1 : domain);
 	} else {
diff --git a/support/export/client.c b/support/export/client.c
index ea4f89d..79164fe 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -699,6 +699,9 @@ check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
 
 	/* check whether the IP itself is in the netgroup */
 	ip = calloc(INET6_ADDRSTRLEN, 1);
+	if (ip == NULL)
+		goto out;
+
 	if (inet_ntop(ai->ai_family, &(((struct sockaddr_in *)ai->ai_addr)->sin_addr), ip, INET6_ADDRSTRLEN) == ip) {
 		if (innetgr(netgroup, ip, NULL, NULL)) {
 			free(hname);
diff --git a/support/export/export.c b/support/export/export.c
index 03390df..3e48c42 100644
--- a/support/export/export.c
+++ b/support/export/export.c
@@ -25,6 +25,7 @@
 #include "exportfs.h"
 #include "nfsd_path.h"
 #include "xlog.h"
+#include "reexport.h"
 
 exp_hash_table exportlist[MCL_MAXTYPES] = {{NULL, {{NULL,NULL}, }}, }; 
 static int export_hash(char *);
@@ -115,6 +116,7 @@ export_read(char *fname, int ignore_hosts)
 	nfs_export		*exp;
 
 	int volumes = 0;
+	int reexport_found = 0;
 
 	setexportent(fname, "r");
 	while ((eep = getexportent(0,1)) != NULL) {
@@ -126,7 +128,25 @@ export_read(char *fname, int ignore_hosts)
 		}
 		else
 			warn_duplicated_exports(exp, eep);
+
+		if (eep->e_reexport)
+			reexport_found = 1;
 	}
+
+	if (reexport_found) {
+		for (int i = 0; i < MCL_MAXTYPES; i++) {
+			for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
+				if (exp->m_export.e_reexport)
+					continue;
+
+				if (exp->m_export.e_flags & NFSEXP_FSID) {
+					xlog(L_ERROR, "When a reexport= option is present no manully assigned numerical fsid= options are allowed");
+					return -1;
+				}
+			}
+		}
+	}
+
 	endexportent();
 
 	return volumes;
diff --git a/support/export/v4clients.c b/support/export/v4clients.c
index 5f15b61..3230251 100644
--- a/support/export/v4clients.c
+++ b/support/export/v4clients.c
@@ -26,7 +26,7 @@ void v4clients_init(void)
 {
 	struct stat sb;
 
-	if (!stat("/proc/fs/nfsd/clients", &sb) == 0 ||
+	if (stat("/proc/fs/nfsd/clients", &sb) != 0 ||
 	    !S_ISDIR(sb.st_mode))
 		return;
 	if (clients_fd >= 0)
diff --git a/support/export/v4root.c b/support/export/v4root.c
index c12a7d8..03805dc 100644
--- a/support/export/v4root.c
+++ b/support/export/v4root.c
@@ -66,6 +66,8 @@ set_pseudofs_security(struct exportent *pseudo)
 
 		if (!flav->fnum)
 			continue;
+		if (flav->need_krb5 && access("/etc/krb5.keytab", F_OK) != 0)
+			continue;
 
 		i = secinfo_addflavor(flav, pseudo);
 		new = &pseudo->e_secinfo[i];
@@ -198,7 +200,7 @@ static int v4root_add_parents(nfs_export *exp)
  * looking for components of the v4 mount.
  */
 void
-v4root_set()
+v4root_set(void)
 {
 	nfs_export	*exp;
 	int	i;
diff --git a/support/export/xtab.c b/support/export/xtab.c
index c888a80..e210ca9 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export)
 }
 
 int
-xtab_export_write()
+xtab_export_write(void)
 {
 	return xtab_write(etab.statefn, etab.tmpfn, etab.lockfn, 1);
 }
diff --git a/support/include/Makefile.in b/support/include/Makefile.in
index a0982c5..6b08669 100644
--- a/support/include/Makefile.in
+++ b/support/include/Makefile.in
@@ -268,6 +268,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -369,7 +371,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/include/nfs/Makefile.in b/support/include/nfs/Makefile.in
index b4eb775..015d6d8 100644
--- a/support/include/nfs/Makefile.in
+++ b/support/include/nfs/Makefile.in
@@ -225,6 +225,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -326,7 +328,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index 0eca828..be5867c 100644
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -40,4 +40,18 @@
 #define NFSEXP_OLD_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
 					| NFSEXP_ALLSQUASH)
 
+/*
+ * Transport layer security policies that are permitted to access
+ * an export
+ */
+#define NFSEXP_XPRTSEC_NONE	0x0001
+#define NFSEXP_XPRTSEC_TLS	0x0002
+#define NFSEXP_XPRTSEC_MTLS	0x0004
+
+#define NFSEXP_XPRTSEC_NUM	(3)
+
+#define NFSEXP_XPRTSEC_ALL	(NFSEXP_XPRTSEC_NONE | \
+				 NFSEXP_XPRTSEC_TLS | \
+				 NFSEXP_XPRTSEC_MTLS)
+
 #endif /* _NSF_EXPORT_H */
diff --git a/support/include/nfsd_path.h b/support/include/nfsd_path.h
index 3b73aad..aa1e1dd 100644
--- a/support/include/nfsd_path.h
+++ b/support/include/nfsd_path.h
@@ -7,7 +7,7 @@
 #include <sys/stat.h>
 
 struct file_handle;
-struct statfs64;
+struct statfs;
 
 void 		nfsd_path_init(void);
 
@@ -18,8 +18,8 @@ char *		nfsd_path_prepend_dir(const char *dir, const char *pathname);
 int 		nfsd_path_stat(const char *pathname, struct stat *statbuf);
 int 		nfsd_path_lstat(const char *pathname, struct stat *statbuf);
 
-int		nfsd_path_statfs64(const char *pathname,
-				   struct statfs64 *statbuf);
+int		nfsd_path_statfs(const char *pathname,
+				   struct statfs *statbuf);
 
 char *		nfsd_realpath(const char *path, char *resolved_path);
 
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 6faba71..bdbde78 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -62,6 +62,18 @@ struct sec_entry {
 	int flags;
 };
 
+#define XPRTSECMODE_COUNT 3
+
+struct xprtsec_info {
+	const char		*name;
+	int			number;
+};
+
+struct xprtsec_entry {
+	const struct xprtsec_info *info;
+	int			flags;
+};
+
 /*
  * Data related to a single exports entry as returned by getexportent.
  * FIXME: export options should probably be parsed at a later time to
@@ -83,8 +95,10 @@ struct exportent {
 	char *          e_fslocdata;
 	char *		e_uuid;
 	struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
+	struct xprtsec_entry e_xprtsec[XPRTSECMODE_COUNT + 1];
 	unsigned int	e_ttl;
 	char *		e_realpath;
+	int		e_reexport;
 };
 
 struct rmtabent {
@@ -99,6 +113,7 @@ struct rmtabent {
 void			setexportent(char *fname, char *type);
 struct exportent *	getexportent(int,int);
 void 			secinfo_show(FILE *fp, struct exportent *ep);
+void			xprtsecinfo_show(FILE *fp, struct exportent *ep);
 void			putexportent(struct exportent *xep);
 void			endexportent(void);
 struct exportent *	mkexportent(char *hname, char *path, char *opts);
diff --git a/support/include/pseudoflavors.h b/support/include/pseudoflavors.h
index deb052b..1f16f3f 100644
--- a/support/include/pseudoflavors.h
+++ b/support/include/pseudoflavors.h
@@ -8,6 +8,7 @@
 struct flav_info {
 	char    *flavour;
 	int     fnum;
+	int	need_krb5;
 };
 
 extern struct flav_info flav_map[];
diff --git a/support/include/rpcsvc/Makefile.in b/support/include/rpcsvc/Makefile.in
index 635d867..3d0b2e7 100644
--- a/support/include/rpcsvc/Makefile.in
+++ b/support/include/rpcsvc/Makefile.in
@@ -225,6 +225,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -326,7 +328,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/include/sys/Makefile.in b/support/include/sys/Makefile.in
index b42c1fb..28f99a6 100644
--- a/support/include/sys/Makefile.in
+++ b/support/include/sys/Makefile.in
@@ -264,6 +264,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -365,7 +367,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/include/sys/fs/Makefile.in b/support/include/sys/fs/Makefile.in
index 5ee8920..596c100 100644
--- a/support/include/sys/fs/Makefile.in
+++ b/support/include/sys/fs/Makefile.in
@@ -225,6 +225,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -326,7 +328,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/junction/Makefile.in b/support/junction/Makefile.in
index ed8cd7f..0e9200b 100644
--- a/support/junction/Makefile.in
+++ b/support/junction/Makefile.in
@@ -261,6 +261,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -362,7 +364,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/junction/junction.c b/support/junction/junction.c
index 41cce26..0628bb0 100644
--- a/support/junction/junction.c
+++ b/support/junction/junction.c
@@ -63,7 +63,7 @@ junction_open_path(const char *pathname, int *fd)
 	if (pathname == NULL || fd == NULL)
 		return FEDFS_ERR_INVAL;
 
-	tmp = open(pathname, O_DIRECTORY);
+	tmp = open(pathname, O_PATH|O_DIRECTORY);
 	if (tmp == -1) {
 		switch (errno) {
 		case EPERM:
@@ -93,7 +93,7 @@ junction_is_directory(int fd, const char *path)
 {
 	struct stat stb;
 
-	if (fstat(fd, &stb) == -1) {
+	if (fstatat(fd, "", &stb, AT_NO_AUTOMOUNT|AT_EMPTY_PATH) == -1) {
 		xlog(D_GENERAL, "%s: failed to stat %s: %m",
 				__func__, path);
 		return FEDFS_ERR_ACCESS;
@@ -121,7 +121,7 @@ junction_is_sticky_bit_set(int fd, const char *path)
 {
 	struct stat stb;
 
-	if (fstat(fd, &stb) == -1) {
+	if (fstatat(fd, "", &stb, AT_NO_AUTOMOUNT|AT_EMPTY_PATH) == -1) {
 		xlog(D_GENERAL, "%s: failed to stat %s: %m",
 				__func__, path);
 		return FEDFS_ERR_ACCESS;
@@ -155,7 +155,7 @@ junction_set_sticky_bit(int fd, const char *path)
 {
 	struct stat stb;
 
-	if (fstat(fd, &stb) == -1) {
+	if (fstatat(fd, "", &stb, AT_NO_AUTOMOUNT|AT_EMPTY_PATH) == -1) {
 		xlog(D_GENERAL, "%s: failed to stat %s: %m",
 			__func__, path);
 		return FEDFS_ERR_ACCESS;
@@ -393,7 +393,7 @@ junction_get_mode(const char *pathname, mode_t *mode)
 	if (retval != FEDFS_OK)
 		return retval;
 
-	if (fstat(fd, &stb) == -1) {
+	if (fstatat(fd, "", &stb, AT_NO_AUTOMOUNT|AT_EMPTY_PATH) == -1) {
 		xlog(D_GENERAL, "%s: failed to stat %s: %m",
 			__func__, pathname);
 		(void)close(fd);
diff --git a/support/misc/Makefile.in b/support/misc/Makefile.in
index 8943bff..45e6cec 100644
--- a/support/misc/Makefile.in
+++ b/support/misc/Makefile.in
@@ -265,6 +265,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -366,7 +368,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c
index 65e53c1..c3dea4f 100644
--- a/support/misc/nfsd_path.c
+++ b/support/misc/nfsd_path.c
@@ -184,46 +184,46 @@ nfsd_path_lstat(const char *pathname, struct stat *statbuf)
 	return nfsd_run_stat(nfsd_wq, nfsd_lstatfunc, pathname, statbuf);
 }
 
-struct nfsd_statfs64_data {
+struct nfsd_statfs_data {
 	const char *pathname;
-	struct statfs64 *statbuf;
+	struct statfs *statbuf;
 	int ret;
 	int err;
 };
 
 static void
-nfsd_statfs64func(void *data)
+nfsd_statfsfunc(void *data)
 {
-	struct nfsd_statfs64_data *d = data;
+	struct nfsd_statfs_data *d = data;
 
-	d->ret = statfs64(d->pathname, d->statbuf);
+	d->ret = statfs(d->pathname, d->statbuf);
 	if (d->ret < 0)
 		d->err = errno;
 }
 
 static int
-nfsd_run_statfs64(struct xthread_workqueue *wq,
+nfsd_run_statfs(struct xthread_workqueue *wq,
 		  const char *pathname,
-		  struct statfs64 *statbuf)
+		  struct statfs *statbuf)
 {
-	struct nfsd_statfs64_data data = {
+	struct nfsd_statfs_data data = {
 		pathname,
 		statbuf,
 		0,
 		0
 	};
-	xthread_work_run_sync(wq, nfsd_statfs64func, &data);
+	xthread_work_run_sync(wq, nfsd_statfsfunc, &data);
 	if (data.ret < 0)
 		errno = data.err;
 	return data.ret;
 }
 
 int
-nfsd_path_statfs64(const char *pathname, struct statfs64 *statbuf)
+nfsd_path_statfs(const char *pathname, struct statfs *statbuf)
 {
 	if (!nfsd_wq)
-		return statfs64(pathname, statbuf);
-	return nfsd_run_statfs64(nfsd_wq, pathname, statbuf);
+		return statfs(pathname, statbuf);
+	return nfsd_run_statfs(nfsd_wq, pathname, statbuf);
 }
 
 struct nfsd_realpath_data {
diff --git a/support/nfs/Makefile.am b/support/nfs/Makefile.am
index 67e3a8e..2e1577c 100644
--- a/support/nfs/Makefile.am
+++ b/support/nfs/Makefile.am
@@ -9,6 +9,7 @@ libnfs_la_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
 		   svc_socket.c cacheio.c closeall.c nfs_mntent.c \
 		   svc_create.c atomicio.c strlcat.c strlcpy.c
 libnfs_la_LIBADD = libnfsconf.la
+libnfs_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) -I$(top_srcdir)/support/reexport
 
 libnfsconf_la_SOURCES = conffile.c xlog.c
 
diff --git a/support/nfs/Makefile.in b/support/nfs/Makefile.in
index 3b97f99..0379852 100644
--- a/support/nfs/Makefile.in
+++ b/support/nfs/Makefile.in
@@ -117,10 +117,15 @@ CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libnfs_la_DEPENDENCIES = libnfsconf.la
-am_libnfs_la_OBJECTS = exports.lo rmtab.lo xio.lo rpcmisc.lo \
-	rpcdispatch.lo xcommon.lo wildmat.lo mydaemon.lo rpc_socket.lo \
-	getport.lo svc_socket.lo cacheio.lo closeall.lo nfs_mntent.lo \
-	svc_create.lo atomicio.lo strlcat.lo strlcpy.lo
+am_libnfs_la_OBJECTS = libnfs_la-exports.lo libnfs_la-rmtab.lo \
+	libnfs_la-xio.lo libnfs_la-rpcmisc.lo libnfs_la-rpcdispatch.lo \
+	libnfs_la-xcommon.lo libnfs_la-wildmat.lo \
+	libnfs_la-mydaemon.lo libnfs_la-rpc_socket.lo \
+	libnfs_la-getport.lo libnfs_la-svc_socket.lo \
+	libnfs_la-cacheio.lo libnfs_la-closeall.lo \
+	libnfs_la-nfs_mntent.lo libnfs_la-svc_create.lo \
+	libnfs_la-atomicio.lo libnfs_la-strlcat.lo \
+	libnfs_la-strlcpy.lo
 libnfs_la_OBJECTS = $(am_libnfs_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -144,16 +149,25 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/atomicio.Plo ./$(DEPDIR)/cacheio.Plo \
-	./$(DEPDIR)/closeall.Plo ./$(DEPDIR)/conffile.Plo \
-	./$(DEPDIR)/exports.Plo ./$(DEPDIR)/getport.Plo \
-	./$(DEPDIR)/mydaemon.Plo ./$(DEPDIR)/nfs_mntent.Plo \
-	./$(DEPDIR)/rmtab.Plo ./$(DEPDIR)/rpc_socket.Plo \
-	./$(DEPDIR)/rpcdispatch.Plo ./$(DEPDIR)/rpcmisc.Plo \
-	./$(DEPDIR)/strlcat.Plo ./$(DEPDIR)/strlcpy.Plo \
-	./$(DEPDIR)/svc_create.Plo ./$(DEPDIR)/svc_socket.Plo \
-	./$(DEPDIR)/wildmat.Plo ./$(DEPDIR)/xcommon.Plo \
-	./$(DEPDIR)/xio.Plo ./$(DEPDIR)/xlog.Plo
+am__depfiles_remade = ./$(DEPDIR)/conffile.Plo \
+	./$(DEPDIR)/libnfs_la-atomicio.Plo \
+	./$(DEPDIR)/libnfs_la-cacheio.Plo \
+	./$(DEPDIR)/libnfs_la-closeall.Plo \
+	./$(DEPDIR)/libnfs_la-exports.Plo \
+	./$(DEPDIR)/libnfs_la-getport.Plo \
+	./$(DEPDIR)/libnfs_la-mydaemon.Plo \
+	./$(DEPDIR)/libnfs_la-nfs_mntent.Plo \
+	./$(DEPDIR)/libnfs_la-rmtab.Plo \
+	./$(DEPDIR)/libnfs_la-rpc_socket.Plo \
+	./$(DEPDIR)/libnfs_la-rpcdispatch.Plo \
+	./$(DEPDIR)/libnfs_la-rpcmisc.Plo \
+	./$(DEPDIR)/libnfs_la-strlcat.Plo \
+	./$(DEPDIR)/libnfs_la-strlcpy.Plo \
+	./$(DEPDIR)/libnfs_la-svc_create.Plo \
+	./$(DEPDIR)/libnfs_la-svc_socket.Plo \
+	./$(DEPDIR)/libnfs_la-wildmat.Plo \
+	./$(DEPDIR)/libnfs_la-xcommon.Plo \
+	./$(DEPDIR)/libnfs_la-xio.Plo ./$(DEPDIR)/xlog.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -271,6 +285,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -372,7 +388,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
@@ -404,6 +419,7 @@ libnfs_la_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
 		   svc_create.c atomicio.c strlcat.c strlcpy.c
 
 libnfs_la_LIBADD = libnfsconf.la
+libnfs_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) -I$(top_srcdir)/support/reexport
 libnfsconf_la_SOURCES = conffile.c xlog.c
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
@@ -466,25 +482,25 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atomicio.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cacheio.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeall.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conffile.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exports.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getport.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mydaemon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfs_mntent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmtab.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc_socket.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcdispatch.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcmisc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svc_create.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svc_socket.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wildmat.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcommon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-atomicio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-cacheio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-closeall.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-exports.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-getport.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-mydaemon.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-nfs_mntent.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-rmtab.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-rpc_socket.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-rpcdispatch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-rpcmisc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-strlcat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-strlcpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-svc_create.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-svc_socket.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-wildmat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-xcommon.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnfs_la-xio.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlog.Plo@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
@@ -514,6 +530,132 @@ am--depfiles: $(am__depfiles_remade)
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+libnfs_la-exports.lo: exports.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-exports.lo -MD -MP -MF $(DEPDIR)/libnfs_la-exports.Tpo -c -o libnfs_la-exports.lo `test -f 'exports.c' || echo '$(srcdir)/'`exports.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-exports.Tpo $(DEPDIR)/libnfs_la-exports.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='exports.c' object='libnfs_la-exports.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-exports.lo `test -f 'exports.c' || echo '$(srcdir)/'`exports.c
+
+libnfs_la-rmtab.lo: rmtab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-rmtab.lo -MD -MP -MF $(DEPDIR)/libnfs_la-rmtab.Tpo -c -o libnfs_la-rmtab.lo `test -f 'rmtab.c' || echo '$(srcdir)/'`rmtab.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-rmtab.Tpo $(DEPDIR)/libnfs_la-rmtab.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rmtab.c' object='libnfs_la-rmtab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-rmtab.lo `test -f 'rmtab.c' || echo '$(srcdir)/'`rmtab.c
+
+libnfs_la-xio.lo: xio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-xio.lo -MD -MP -MF $(DEPDIR)/libnfs_la-xio.Tpo -c -o libnfs_la-xio.lo `test -f 'xio.c' || echo '$(srcdir)/'`xio.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-xio.Tpo $(DEPDIR)/libnfs_la-xio.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xio.c' object='libnfs_la-xio.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-xio.lo `test -f 'xio.c' || echo '$(srcdir)/'`xio.c
+
+libnfs_la-rpcmisc.lo: rpcmisc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-rpcmisc.lo -MD -MP -MF $(DEPDIR)/libnfs_la-rpcmisc.Tpo -c -o libnfs_la-rpcmisc.lo `test -f 'rpcmisc.c' || echo '$(srcdir)/'`rpcmisc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-rpcmisc.Tpo $(DEPDIR)/libnfs_la-rpcmisc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rpcmisc.c' object='libnfs_la-rpcmisc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-rpcmisc.lo `test -f 'rpcmisc.c' || echo '$(srcdir)/'`rpcmisc.c
+
+libnfs_la-rpcdispatch.lo: rpcdispatch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-rpcdispatch.lo -MD -MP -MF $(DEPDIR)/libnfs_la-rpcdispatch.Tpo -c -o libnfs_la-rpcdispatch.lo `test -f 'rpcdispatch.c' || echo '$(srcdir)/'`rpcdispatch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-rpcdispatch.Tpo $(DEPDIR)/libnfs_la-rpcdispatch.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rpcdispatch.c' object='libnfs_la-rpcdispatch.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-rpcdispatch.lo `test -f 'rpcdispatch.c' || echo '$(srcdir)/'`rpcdispatch.c
+
+libnfs_la-xcommon.lo: xcommon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-xcommon.lo -MD -MP -MF $(DEPDIR)/libnfs_la-xcommon.Tpo -c -o libnfs_la-xcommon.lo `test -f 'xcommon.c' || echo '$(srcdir)/'`xcommon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-xcommon.Tpo $(DEPDIR)/libnfs_la-xcommon.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xcommon.c' object='libnfs_la-xcommon.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-xcommon.lo `test -f 'xcommon.c' || echo '$(srcdir)/'`xcommon.c
+
+libnfs_la-wildmat.lo: wildmat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-wildmat.lo -MD -MP -MF $(DEPDIR)/libnfs_la-wildmat.Tpo -c -o libnfs_la-wildmat.lo `test -f 'wildmat.c' || echo '$(srcdir)/'`wildmat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-wildmat.Tpo $(DEPDIR)/libnfs_la-wildmat.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wildmat.c' object='libnfs_la-wildmat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-wildmat.lo `test -f 'wildmat.c' || echo '$(srcdir)/'`wildmat.c
+
+libnfs_la-mydaemon.lo: mydaemon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-mydaemon.lo -MD -MP -MF $(DEPDIR)/libnfs_la-mydaemon.Tpo -c -o libnfs_la-mydaemon.lo `test -f 'mydaemon.c' || echo '$(srcdir)/'`mydaemon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-mydaemon.Tpo $(DEPDIR)/libnfs_la-mydaemon.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mydaemon.c' object='libnfs_la-mydaemon.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-mydaemon.lo `test -f 'mydaemon.c' || echo '$(srcdir)/'`mydaemon.c
+
+libnfs_la-rpc_socket.lo: rpc_socket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-rpc_socket.lo -MD -MP -MF $(DEPDIR)/libnfs_la-rpc_socket.Tpo -c -o libnfs_la-rpc_socket.lo `test -f 'rpc_socket.c' || echo '$(srcdir)/'`rpc_socket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-rpc_socket.Tpo $(DEPDIR)/libnfs_la-rpc_socket.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rpc_socket.c' object='libnfs_la-rpc_socket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-rpc_socket.lo `test -f 'rpc_socket.c' || echo '$(srcdir)/'`rpc_socket.c
+
+libnfs_la-getport.lo: getport.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-getport.lo -MD -MP -MF $(DEPDIR)/libnfs_la-getport.Tpo -c -o libnfs_la-getport.lo `test -f 'getport.c' || echo '$(srcdir)/'`getport.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-getport.Tpo $(DEPDIR)/libnfs_la-getport.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='getport.c' object='libnfs_la-getport.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-getport.lo `test -f 'getport.c' || echo '$(srcdir)/'`getport.c
+
+libnfs_la-svc_socket.lo: svc_socket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-svc_socket.lo -MD -MP -MF $(DEPDIR)/libnfs_la-svc_socket.Tpo -c -o libnfs_la-svc_socket.lo `test -f 'svc_socket.c' || echo '$(srcdir)/'`svc_socket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-svc_socket.Tpo $(DEPDIR)/libnfs_la-svc_socket.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='svc_socket.c' object='libnfs_la-svc_socket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-svc_socket.lo `test -f 'svc_socket.c' || echo '$(srcdir)/'`svc_socket.c
+
+libnfs_la-cacheio.lo: cacheio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-cacheio.lo -MD -MP -MF $(DEPDIR)/libnfs_la-cacheio.Tpo -c -o libnfs_la-cacheio.lo `test -f 'cacheio.c' || echo '$(srcdir)/'`cacheio.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-cacheio.Tpo $(DEPDIR)/libnfs_la-cacheio.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cacheio.c' object='libnfs_la-cacheio.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-cacheio.lo `test -f 'cacheio.c' || echo '$(srcdir)/'`cacheio.c
+
+libnfs_la-closeall.lo: closeall.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-closeall.lo -MD -MP -MF $(DEPDIR)/libnfs_la-closeall.Tpo -c -o libnfs_la-closeall.lo `test -f 'closeall.c' || echo '$(srcdir)/'`closeall.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-closeall.Tpo $(DEPDIR)/libnfs_la-closeall.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='closeall.c' object='libnfs_la-closeall.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-closeall.lo `test -f 'closeall.c' || echo '$(srcdir)/'`closeall.c
+
+libnfs_la-nfs_mntent.lo: nfs_mntent.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-nfs_mntent.lo -MD -MP -MF $(DEPDIR)/libnfs_la-nfs_mntent.Tpo -c -o libnfs_la-nfs_mntent.lo `test -f 'nfs_mntent.c' || echo '$(srcdir)/'`nfs_mntent.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-nfs_mntent.Tpo $(DEPDIR)/libnfs_la-nfs_mntent.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nfs_mntent.c' object='libnfs_la-nfs_mntent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-nfs_mntent.lo `test -f 'nfs_mntent.c' || echo '$(srcdir)/'`nfs_mntent.c
+
+libnfs_la-svc_create.lo: svc_create.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-svc_create.lo -MD -MP -MF $(DEPDIR)/libnfs_la-svc_create.Tpo -c -o libnfs_la-svc_create.lo `test -f 'svc_create.c' || echo '$(srcdir)/'`svc_create.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-svc_create.Tpo $(DEPDIR)/libnfs_la-svc_create.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='svc_create.c' object='libnfs_la-svc_create.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-svc_create.lo `test -f 'svc_create.c' || echo '$(srcdir)/'`svc_create.c
+
+libnfs_la-atomicio.lo: atomicio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-atomicio.lo -MD -MP -MF $(DEPDIR)/libnfs_la-atomicio.Tpo -c -o libnfs_la-atomicio.lo `test -f 'atomicio.c' || echo '$(srcdir)/'`atomicio.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-atomicio.Tpo $(DEPDIR)/libnfs_la-atomicio.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atomicio.c' object='libnfs_la-atomicio.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-atomicio.lo `test -f 'atomicio.c' || echo '$(srcdir)/'`atomicio.c
+
+libnfs_la-strlcat.lo: strlcat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-strlcat.lo -MD -MP -MF $(DEPDIR)/libnfs_la-strlcat.Tpo -c -o libnfs_la-strlcat.lo `test -f 'strlcat.c' || echo '$(srcdir)/'`strlcat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-strlcat.Tpo $(DEPDIR)/libnfs_la-strlcat.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strlcat.c' object='libnfs_la-strlcat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-strlcat.lo `test -f 'strlcat.c' || echo '$(srcdir)/'`strlcat.c
+
+libnfs_la-strlcpy.lo: strlcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnfs_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libnfs_la-strlcpy.Tpo -c -o libnfs_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnfs_la-strlcpy.Tpo $(DEPDIR)/libnfs_la-strlcpy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strlcpy.c' object='libnfs_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnfs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnfs_la-strlcpy.lo `test -f 'strlcpy.c' || echo '$(srcdir)/'`strlcpy.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -645,25 +787,25 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/atomicio.Plo
-	-rm -f ./$(DEPDIR)/cacheio.Plo
-	-rm -f ./$(DEPDIR)/closeall.Plo
-	-rm -f ./$(DEPDIR)/conffile.Plo
-	-rm -f ./$(DEPDIR)/exports.Plo
-	-rm -f ./$(DEPDIR)/getport.Plo
-	-rm -f ./$(DEPDIR)/mydaemon.Plo
-	-rm -f ./$(DEPDIR)/nfs_mntent.Plo
-	-rm -f ./$(DEPDIR)/rmtab.Plo
-	-rm -f ./$(DEPDIR)/rpc_socket.Plo
-	-rm -f ./$(DEPDIR)/rpcdispatch.Plo
-	-rm -f ./$(DEPDIR)/rpcmisc.Plo
-	-rm -f ./$(DEPDIR)/strlcat.Plo
-	-rm -f ./$(DEPDIR)/strlcpy.Plo
-	-rm -f ./$(DEPDIR)/svc_create.Plo
-	-rm -f ./$(DEPDIR)/svc_socket.Plo
-	-rm -f ./$(DEPDIR)/wildmat.Plo
-	-rm -f ./$(DEPDIR)/xcommon.Plo
-	-rm -f ./$(DEPDIR)/xio.Plo
+		-rm -f ./$(DEPDIR)/conffile.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-atomicio.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-cacheio.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-closeall.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-exports.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-getport.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-mydaemon.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-nfs_mntent.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rmtab.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rpc_socket.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rpcdispatch.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rpcmisc.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-strlcat.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-strlcpy.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-svc_create.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-svc_socket.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-wildmat.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-xcommon.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-xio.Plo
 	-rm -f ./$(DEPDIR)/xlog.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -710,25 +852,25 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/atomicio.Plo
-	-rm -f ./$(DEPDIR)/cacheio.Plo
-	-rm -f ./$(DEPDIR)/closeall.Plo
-	-rm -f ./$(DEPDIR)/conffile.Plo
-	-rm -f ./$(DEPDIR)/exports.Plo
-	-rm -f ./$(DEPDIR)/getport.Plo
-	-rm -f ./$(DEPDIR)/mydaemon.Plo
-	-rm -f ./$(DEPDIR)/nfs_mntent.Plo
-	-rm -f ./$(DEPDIR)/rmtab.Plo
-	-rm -f ./$(DEPDIR)/rpc_socket.Plo
-	-rm -f ./$(DEPDIR)/rpcdispatch.Plo
-	-rm -f ./$(DEPDIR)/rpcmisc.Plo
-	-rm -f ./$(DEPDIR)/strlcat.Plo
-	-rm -f ./$(DEPDIR)/strlcpy.Plo
-	-rm -f ./$(DEPDIR)/svc_create.Plo
-	-rm -f ./$(DEPDIR)/svc_socket.Plo
-	-rm -f ./$(DEPDIR)/wildmat.Plo
-	-rm -f ./$(DEPDIR)/xcommon.Plo
-	-rm -f ./$(DEPDIR)/xio.Plo
+		-rm -f ./$(DEPDIR)/conffile.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-atomicio.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-cacheio.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-closeall.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-exports.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-getport.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-mydaemon.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-nfs_mntent.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rmtab.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rpc_socket.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rpcdispatch.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-rpcmisc.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-strlcat.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-strlcpy.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-svc_create.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-svc_socket.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-wildmat.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-xcommon.Plo
+	-rm -f ./$(DEPDIR)/libnfs_la-xio.Plo
 	-rm -f ./$(DEPDIR)/xlog.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 2c8f075..15dc574 100644
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -31,18 +31,19 @@
 #include "xlog.h"
 #include "xio.h"
 #include "pseudoflavors.h"
+#include "reexport.h"
 
 #define EXPORT_DEFAULT_FLAGS	\
   (NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES|NFSEXP_NOSUBTREECHECK)
 
 struct flav_info flav_map[] = {
-	{ "krb5",	RPC_AUTH_GSS_KRB5	},
-	{ "krb5i",	RPC_AUTH_GSS_KRB5I	},
-	{ "krb5p",	RPC_AUTH_GSS_KRB5P	},
-	{ "unix",	AUTH_UNIX		},
-	{ "sys",	AUTH_SYS		},
-	{ "null",	AUTH_NULL		},
-	{ "none",	AUTH_NONE		},
+	{ "krb5",	RPC_AUTH_GSS_KRB5,	1},
+	{ "krb5i",	RPC_AUTH_GSS_KRB5I,	1},
+	{ "krb5p",	RPC_AUTH_GSS_KRB5P,	1},
+	{ "unix",	AUTH_UNIX,		0},
+	{ "sys",	AUTH_SYS,		0},
+	{ "null",	AUTH_NULL,		0},
+	{ "none",	AUTH_NONE,		0},
 };
 
 const int flav_map_size = sizeof(flav_map)/sizeof(flav_map[0]);
@@ -99,10 +100,12 @@ static void init_exportent (struct exportent *ee, int fromkernel)
 	ee->e_fslocmethod = FSLOC_NONE;
 	ee->e_fslocdata = NULL;
 	ee->e_secinfo[0].flav = NULL;
+	ee->e_xprtsec[0].info = NULL;
 	ee->e_nsquids = 0;
 	ee->e_nsqgids = 0;
 	ee->e_uuid = NULL;
 	ee->e_ttl = default_ttl;
+	ee->e_reexport = REEXP_NONE;
 }
 
 struct exportent *
@@ -122,7 +125,7 @@ getexportent(int fromkernel, int fromexports)
 	if (first || (ok = getexport(exp, sizeof(exp))) == 0) {
 		has_default_opts = 0;
 		has_default_subtree_opts = 0;
-	
+
 		init_exportent(&def_ee, fromkernel);
 
 		ok = getpath(def_ee.e_path, sizeof(def_ee.e_path));
@@ -146,7 +149,7 @@ getexportent(int fromkernel, int fromexports)
 	if (exp[0] == '-' && !fromkernel) {
 		if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0)
 			return NULL;
-		
+
 		has_default_opts = 1;
 
 		ok = getexport(exp, sizeof(exp));
@@ -239,7 +242,6 @@ void secinfo_show(FILE *fp, struct exportent *ep)
 	if (ep->e_secinfo[0].flav == NULL)
 		secinfo_addflavor(find_flavor("sys"), ep);
 	for (p1=ep->e_secinfo; p1->flav; p1=p2) {
-
 		fprintf(fp, ",sec=%s", p1->flav->flavour);
 		for (p2=p1+1; (p2->flav != NULL) && (p1->flags == p2->flags);
 								p2++) {
@@ -249,6 +251,17 @@ void secinfo_show(FILE *fp, struct exportent *ep)
 	}
 }
 
+void xprtsecinfo_show(FILE *fp, struct exportent *ep)
+{
+	struct xprtsec_entry *p1, *p2;
+
+	for (p1 = ep->e_xprtsec; p1->info; p1 = p2) {
+		fprintf(fp, ",xprtsec=%s", p1->info->name);
+		for (p2 = p1 + 1; p2->info && (p1->flags == p2->flags); p2++)
+			fprintf(fp, ":%s", p2->info->name);
+	}
+}
+
 static void
 fprintpath(FILE *fp, const char *path)
 {
@@ -302,6 +315,23 @@ putexportent(struct exportent *ep)
 	}
 	if (ep->e_uuid)
 		fprintf(fp, "fsid=%s,", ep->e_uuid);
+
+	if (ep->e_reexport) {
+		fprintf(fp, "reexport=");
+		switch (ep->e_reexport) {
+			case REEXP_AUTO_FSIDNUM:
+				fprintf(fp, "auto-fsidnum");
+				break;
+			case REEXP_PREDEFINED_FSIDNUM:
+				fprintf(fp, "predefined-fsidnum");
+				break;
+			default:
+				xlog(L_ERROR, "unknown reexport method %i", ep->e_reexport);
+				fprintf(fp, "none");
+		}
+		fprintf(fp, ",");
+	}
+
 	if (ep->e_mountpoint)
 		fprintf(fp, "mountpoint%s%s,",
 			ep->e_mountpoint[0]?"=":"", ep->e_mountpoint);
@@ -345,6 +375,7 @@ putexportent(struct exportent *ep)
 	}
 	fprintf(fp, "anonuid=%d,anongid=%d", ep->e_anonuid, ep->e_anongid);
 	secinfo_show(fp, ep);
+	xprtsecinfo_show(fp, ep);
 	fprintf(fp, ")\n");
 }
 
@@ -483,6 +514,75 @@ static unsigned int parse_flavors(char *str, struct exportent *ep)
 	return out;
 }
 
+static const struct xprtsec_info xprtsec_name2info[] = {
+	{ "none",	NFSEXP_XPRTSEC_NONE },
+	{ "tls",	NFSEXP_XPRTSEC_TLS },
+	{ "mtls",	NFSEXP_XPRTSEC_MTLS },
+	{ NULL,		0 }
+};
+
+static const struct xprtsec_info *find_xprtsec_info(const char *name)
+{
+	const struct xprtsec_info *info;
+
+	for (info = xprtsec_name2info; info->name; info++)
+		if (strcmp(info->name, name) == 0)
+			return info;
+	return NULL;
+}
+
+/*
+ * Append the given xprtsec mode to the exportent's e_xprtsec array,
+ * or do nothing if it's already there. Returns the index of flavor in
+ * the resulting array in any case.
+ */
+static int xprtsec_addmode(const struct xprtsec_info *info, struct exportent *ep)
+{
+	struct xprtsec_entry *p;
+
+	for (p = ep->e_xprtsec; p->info; p++)
+		if (p->info == info || p->info->number == info->number)
+			return p - ep->e_xprtsec;
+
+	if (p - ep->e_xprtsec >= XPRTSECMODE_COUNT) {
+		xlog(L_ERROR, "more than %d xprtsec modes on an export\n",
+			XPRTSECMODE_COUNT);
+		return -1;
+	}
+	p->info = info;
+	p->flags = ep->e_flags;
+	(p + 1)->info = NULL;
+	return p - ep->e_xprtsec;
+}
+
+/*
+ * @str is a colon seperated list of transport layer security modes.
+ * Their order is recorded in @ep, and a bitmap corresponding to the
+ * list is returned.
+ *
+ * A zero return indicates an error.
+ */
+static unsigned int parse_xprtsec(char *str, struct exportent *ep)
+{
+	unsigned int out = 0;
+	char *name;
+
+	while ((name = strsep(&str, ":"))) {
+		const struct xprtsec_info *info = find_xprtsec_info(name);
+		int bit;
+
+		if (!info) {
+			xlog(L_ERROR, "unknown xprtsec mode %s\n", name);
+			return 0;
+		}
+		bit = xprtsec_addmode(info, ep);
+		if (bit < 0)
+			return 0;
+		out |= 1 << bit;
+	}
+	return out;
+}
+
 /* Sets the bits in @mask for the appropriate security flavor flags. */
 static void setflags(int mask, unsigned int active, struct exportent *ep)
 {
@@ -538,6 +638,7 @@ parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
 	char 	*flname = efname?efname:"command line";
 	int	flline = efp?efp->x_line:0;
 	unsigned int active = 0;
+	int saw_reexport = 0;
 
 	squids = ep->e_squids; nsquids = ep->e_nsquids;
 	sqgids = ep->e_sqgids; nsqgids = ep->e_nsqgids;
@@ -621,7 +722,7 @@ parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
 			ep->e_anonuid = strtol(opt+8, &oe, 10);
 			if (opt[8]=='\0' || *oe != '\0') {
 				xlog(L_ERROR, "%s: %d: bad anonuid \"%s\"\n",
-				     flname, flline, opt);	
+				     flname, flline, opt);
 bad_option:
 				free(opt);
 				return -1;
@@ -631,7 +732,7 @@ bad_option:
 			ep->e_anongid = strtol(opt+8, &oe, 10);
 			if (opt[8]=='\0' || *oe != '\0') {
 				xlog(L_ERROR, "%s: %d: bad anongid \"%s\"\n",
-				     flname, flline, opt);	
+				     flname, flline, opt);
 				goto bad_option;
 			}
 		} else if (strncmp(opt, "squash_uids=", 12) == 0) {
@@ -644,18 +745,25 @@ bad_option:
 			}
 		} else if (strncmp(opt, "fsid=", 5) == 0) {
 			char *oe;
+
+			if (saw_reexport) {
+				xlog(L_ERROR, "%s:%d: 'fsid=' has to be before 'reexport=' %s\n",
+				     flname, flline, opt);
+				goto bad_option;
+			}
+
 			if (strcmp(opt+5, "root") == 0) {
 				ep->e_fsid = 0;
 				setflags(NFSEXP_FSID, active, ep);
 			} else {
 				ep->e_fsid = strtoul(opt+5, &oe, 0);
-				if (opt[5]!='\0' && *oe == '\0') 
+				if (opt[5]!='\0' && *oe == '\0')
 					setflags(NFSEXP_FSID, active, ep);
 				else if (valid_uuid(opt+5))
 					ep->e_uuid = strdup(opt+5);
 				else {
 					xlog(L_ERROR, "%s: %d: bad fsid \"%s\"\n",
-					     flname, flline, opt);	
+					     flname, flline, opt);
 					goto bad_option;
 				}
 			}
@@ -688,6 +796,44 @@ bad_option:
 			active = parse_flavors(opt+4, ep);
 			if (!active)
 				goto bad_option;
+		} else if (strncmp(opt, "xprtsec=", 8) == 0) {
+			if (!parse_xprtsec(opt + 8, ep))
+				goto bad_option;
+		} else if (strncmp(opt, "reexport=", 9) == 0) {
+			char *strategy = strchr(opt, '=');
+
+			if (!strategy) {
+				xlog(L_ERROR, "%s:%d: bad option %s\n",
+				     flname, flline, opt);
+				goto bad_option;
+			}
+			strategy++;
+
+			if (saw_reexport) {
+				xlog(L_ERROR, "%s:%d: only one 'reexport=' is allowed%s\n",
+				     flname, flline, opt);
+				goto bad_option;
+			}
+
+			if (strcmp(strategy, "auto-fsidnum") == 0) {
+				ep->e_reexport = REEXP_AUTO_FSIDNUM;
+			} else if (strcmp(strategy, "predefined-fsidnum") == 0) {
+				ep->e_reexport = REEXP_PREDEFINED_FSIDNUM;
+			} else if (strcmp(strategy, "none") == 0) {
+				ep->e_reexport = REEXP_NONE;
+			} else {
+				xlog(L_ERROR, "%s:%d: bad option %s\n",
+				     flname, flline, strategy);
+				goto bad_option;
+			}
+
+			if (reexpdb_apply_reexport_settings(ep, flname, flline) != 0)
+				goto bad_option;
+
+			if (ep->e_fsid)
+				setflags(NFSEXP_FSID, active, ep);
+
+			saw_reexport = 1;
 		} else {
 			xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n",
 					flname, flline, opt);
@@ -709,7 +855,7 @@ out:
 	if (warn && !had_subtree_opt)
 		xlog(L_WARNING, "%s [%d]: Neither 'subtree_check' or 'no_subtree_check' specified for export \"%s:%s\".\n"
 				"  Assuming default behaviour ('no_subtree_check').\n"
-		     		"  NOTE: this default has changed since nfs-utils version 1.0.x\n",
+				"  NOTE: this default has changed since nfs-utils version 1.0.x\n",
 
 				flname, flline,
 				ep->e_hostname, ep->e_path);
diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c
index e5861b9..fa125ce 100644
--- a/support/nfs/xlog.c
+++ b/support/nfs/xlog.c
@@ -46,11 +46,13 @@ int export_errno = 0;
 
 static void	xlog_toggle(int sig);
 static struct xlog_debugfac	debugnames[] = {
+	{ "0",		0, },
 	{ "general",	D_GENERAL, },
 	{ "call",	D_CALL, },
 	{ "auth",	D_AUTH, },
 	{ "parse",	D_PARSE, },
 	{ "all",	D_ALL, },
+	{ "1",		D_ALL, },
 	{ NULL,		0, },
 };
 
@@ -119,13 +121,14 @@ xlog_sconfig(char *kind, int on)
 {
 	struct xlog_debugfac	*tbl = debugnames;
 
-	while (tbl->df_name != NULL && strcasecmp(tbl->df_name, kind)) 
+	while (tbl->df_name != NULL && strcasecmp(tbl->df_name, kind))
 		tbl++;
 	if (!tbl->df_name) {
 		xlog (L_WARNING, "Invalid debug facility: %s\n", kind);
 		return;
 	}
-	xlog_config(tbl->df_fac, on);
+	if (tbl->df_fac)
+		xlog_config(tbl->df_fac, on);
 }
 
 void
diff --git a/support/nfsidmap/Makefile.in b/support/nfsidmap/Makefile.in
index 34346bd..196f05e 100644
--- a/support/nfsidmap/Makefile.in
+++ b/support/nfsidmap/Makefile.in
@@ -339,6 +339,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -440,7 +442,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/nfsidmap/regex.c b/support/nfsidmap/regex.c
index 958b4ac..8424179 100644
--- a/support/nfsidmap/regex.c
+++ b/support/nfsidmap/regex.c
@@ -542,7 +542,7 @@ struct trans_func regex_trans = {
 	.gss_princ_to_grouplist	= regex_gss_princ_to_grouplist,
 };
 
-struct trans_func *libnfsidmap_plugin_init()
+struct trans_func *libnfsidmap_plugin_init(void)
 {
 	return (&regex_trans);
 }
diff --git a/support/nsm/Makefile.in b/support/nsm/Makefile.in
index ef09b50..0bab45e 100644
--- a/support/nsm/Makefile.in
+++ b/support/nsm/Makefile.in
@@ -268,6 +268,8 @@ LIBCRYPT = @LIBCRYPT@
 LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBPTHREAD = @LIBPTHREAD@
@@ -369,7 +371,6 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-modprobedir = @modprobedir@
 mountfile = @mountfile@
 nfsconfig = @nfsconfig@
 oldincludedir = @oldincludedir@
diff --git a/support/reexport/Makefile.am b/support/reexport/Makefile.am
new file mode 100644
index 0000000..fbd66a2
--- /dev/null
+++ b/support/reexport/Makefile.am
@@ -0,0 +1,18 @@
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libreexport.a
+libreexport_a_SOURCES = reexport.c
+
+sbin_PROGRAMS	= fsidd
+
+fsidd_SOURCES = fsidd.c backend_sqlite.c
+
+fsidd_LDADD = ../../support/misc/libmisc.a \
+	      ../../support/nfs/libnfs.la \
+	       $(LIBPTHREAD) $(LIBEVENT) $(LIBSQLITE) \
+	       $(OPTLIBS)
+
+fsidd_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
+		  -I$(top_builddir)/support/include
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/support/reexport/Makefile.in b/support/reexport/Makefile.in
new file mode 100644
index 0000000..4b70d8d
--- /dev/null
+++ b/support/reexport/Makefile.in
@@ -0,0 +1,797 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+sbin_PROGRAMS = fsidd$(EXEEXT)
+subdir = support/reexport
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/aclocal/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/aclocal/bsdsignals.m4 \
+	$(top_srcdir)/aclocal/ipv6.m4 \
+	$(top_srcdir)/aclocal/kerberos5.m4 \
+	$(top_srcdir)/aclocal/keyutils.m4 \
+	$(top_srcdir)/aclocal/libblkid.m4 \
+	$(top_srcdir)/aclocal/libcap.m4 \
+	$(top_srcdir)/aclocal/libevent.m4 \
+	$(top_srcdir)/aclocal/libpthread.m4 \
+	$(top_srcdir)/aclocal/libsqlite3.m4 \
+	$(top_srcdir)/aclocal/libtirpc.m4 \
+	$(top_srcdir)/aclocal/libxml2.m4 \
+	$(top_srcdir)/aclocal/nfs-utils.m4 \
+	$(top_srcdir)/aclocal/rpcsec_vers.m4 \
+	$(top_srcdir)/aclocal/tcp-wrappers.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/support/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)"
+PROGRAMS = $(sbin_PROGRAMS)
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
+libreexport_a_AR = $(AR) $(ARFLAGS)
+libreexport_a_LIBADD =
+am_libreexport_a_OBJECTS = reexport.$(OBJEXT)
+libreexport_a_OBJECTS = $(am_libreexport_a_OBJECTS)
+am_fsidd_OBJECTS = fsidd-fsidd.$(OBJEXT) \
+	fsidd-backend_sqlite.$(OBJEXT)
+fsidd_OBJECTS = $(am_fsidd_OBJECTS)
+am__DEPENDENCIES_1 =
+fsidd_DEPENDENCIES = ../../support/misc/libmisc.a \
+	../../support/nfs/libnfs.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fsidd-backend_sqlite.Po \
+	./$(DEPDIR)/fsidd-fsidd.Po ./$(DEPDIR)/reexport.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libreexport_a_SOURCES) $(fsidd_SOURCES)
+DIST_SOURCES = $(libreexport_a_SOURCES) $(fsidd_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ETAGS = @ETAGS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILECMD = @FILECMD@
+GREP = @GREP@
+GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
+GSSAPI_LIBS = @GSSAPI_LIBS@
+GSSD = @GSSD@
+GSSGLUE_CFLAGS = @GSSGLUE_CFLAGS@
+GSSGLUE_LIBS = @GSSGLUE_LIBS@
+GSSKRB_CFLAGS = @GSSKRB_CFLAGS@
+GSSKRB_LIBS = @GSSKRB_LIBS@
+HAVE_LIBWRAP = @HAVE_LIBWRAP@
+HAVE_TCP_WRAPPER = @HAVE_TCP_WRAPPER@
+IDMAPD = @IDMAPD@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+K5VERS = @K5VERS@
+KRBCFLAGS = @KRBCFLAGS@
+KRBDIR = @KRBDIR@
+KRBLDFLAGS = @KRBLDFLAGS@
+KRBLIBS = @KRBLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LIBBLKID = @LIBBLKID@
+LIBBSD = @LIBBSD@
+LIBCAP = @LIBCAP@
+LIBCRYPT = @LIBCRYPT@
+LIBEVENT = @LIBEVENT@
+LIBKEYUTILS = @LIBKEYUTILS@
+LIBMOUNT = @LIBMOUNT@
+LIBMOUNT_CFLAGS = @LIBMOUNT_CFLAGS@
+LIBMOUNT_LIBS = @LIBMOUNT_LIBS@
+LIBNSL = @LIBNSL@
+LIBOBJS = @LIBOBJS@
+LIBPTHREAD = @LIBPTHREAD@
+LIBS = @LIBS@
+LIBSOCKET = @LIBSOCKET@
+LIBSQLITE = @LIBSQLITE@
+LIBTIRPC = @LIBTIRPC@
+LIBTOOL = @LIBTOOL@
+LIBWRAP = @LIBWRAP@
+LIBXML2 = @LIBXML2@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_PLUGINS = @PATH_PLUGINS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+RELEASE = @RELEASE@
+RPCGEN_PATH = @RPCGEN_PATH@
+RPCSECGSS_CFLAGS = @RPCSECGSS_CFLAGS@
+RPCSECGSS_LIBS = @RPCSECGSS_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SVCGSSD = @SVCGSSD@
+TIRPC_CFLAGS = @TIRPC_CFLAGS@
+TIRPC_LIBS = @TIRPC_LIBS@
+VERSION = @VERSION@
+XML2_CFLAGS = @XML2_CFLAGS@
+XML2_LIBS = @XML2_LIBS@
+_rpc_pipefsmount = @_rpc_pipefsmount@
+_statedir = @_statedir@
+_sysconfdir = @_sysconfdir@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_gss = @enable_gss@
+enable_ipv6 = @enable_ipv6@
+enable_mountconfig = @enable_mountconfig@
+enable_nfsv4 = @enable_nfsv4@
+enable_nfsv41 = @enable_nfsv41@
+enable_svcgss = @enable_svcgss@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+kprefix = @kprefix@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+mountfile = @mountfile@
+nfsconfig = @nfsconfig@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+rpc_pipefsmount = @rpc_pipefsmount@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+startstatd = @startstatd@
+statdpath = @statdpath@
+statduser = @statduser@
+statedir = @statedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+unitdir = @unitdir@
+noinst_LIBRARIES = libreexport.a
+libreexport_a_SOURCES = reexport.c
+fsidd_SOURCES = fsidd.c backend_sqlite.c
+fsidd_LDADD = ../../support/misc/libmisc.a \
+	      ../../support/nfs/libnfs.la \
+	       $(LIBPTHREAD) $(LIBEVENT) $(LIBSQLITE) \
+	       $(OPTLIBS)
+
+fsidd_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
+		  -I$(top_builddir)/support/include
+
+MAINTAINERCLEANFILES = Makefile.in
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu support/reexport/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu support/reexport/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libreexport.a: $(libreexport_a_OBJECTS) $(libreexport_a_DEPENDENCIES) $(EXTRA_libreexport_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libreexport.a
+	$(AM_V_AR)$(libreexport_a_AR) libreexport.a $(libreexport_a_OBJECTS) $(libreexport_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libreexport.a
+
+fsidd$(EXEEXT): $(fsidd_OBJECTS) $(fsidd_DEPENDENCIES) $(EXTRA_fsidd_DEPENDENCIES) 
+	@rm -f fsidd$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(fsidd_OBJECTS) $(fsidd_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsidd-backend_sqlite.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsidd-fsidd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reexport.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+fsidd-fsidd.o: fsidd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fsidd-fsidd.o -MD -MP -MF $(DEPDIR)/fsidd-fsidd.Tpo -c -o fsidd-fsidd.o `test -f 'fsidd.c' || echo '$(srcdir)/'`fsidd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fsidd-fsidd.Tpo $(DEPDIR)/fsidd-fsidd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fsidd.c' object='fsidd-fsidd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fsidd-fsidd.o `test -f 'fsidd.c' || echo '$(srcdir)/'`fsidd.c
+
+fsidd-fsidd.obj: fsidd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fsidd-fsidd.obj -MD -MP -MF $(DEPDIR)/fsidd-fsidd.Tpo -c -o fsidd-fsidd.obj `if test -f 'fsidd.c'; then $(CYGPATH_W) 'fsidd.c'; else $(CYGPATH_W) '$(srcdir)/fsidd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fsidd-fsidd.Tpo $(DEPDIR)/fsidd-fsidd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fsidd.c' object='fsidd-fsidd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fsidd-fsidd.obj `if test -f 'fsidd.c'; then $(CYGPATH_W) 'fsidd.c'; else $(CYGPATH_W) '$(srcdir)/fsidd.c'; fi`
+
+fsidd-backend_sqlite.o: backend_sqlite.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fsidd-backend_sqlite.o -MD -MP -MF $(DEPDIR)/fsidd-backend_sqlite.Tpo -c -o fsidd-backend_sqlite.o `test -f 'backend_sqlite.c' || echo '$(srcdir)/'`backend_sqlite.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fsidd-backend_sqlite.Tpo $(DEPDIR)/fsidd-backend_sqlite.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='backend_sqlite.c' object='fsidd-backend_sqlite.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fsidd-backend_sqlite.o `test -f 'backend_sqlite.c' || echo '$(srcdir)/'`backend_sqlite.c
+
+fsidd-backend_sqlite.obj: backend_sqlite.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fsidd-backend_sqlite.obj -MD -MP -MF $(DEPDIR)/fsidd-backend_sqlite.Tpo -c -o fsidd-backend_sqlite.obj `if test -f 'backend_sqlite.c'; then $(CYGPATH_W) 'backend_sqlite.c'; else $(CYGPATH_W) '$(srcdir)/backend_sqlite.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fsidd-backend_sqlite.Tpo $(DEPDIR)/fsidd-backend_sqlite.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='backend_sqlite.c' object='fsidd-backend_sqlite.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fsidd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fsidd-backend_sqlite.obj `if test -f 'backend_sqlite.c'; then $(CYGPATH_W) 'backend_sqlite.c'; else $(CYGPATH_W) '$(srcdir)/backend_sqlite.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(LIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)"; do \