Imported upstream 1.2.6

diff --combined configure.ac
index 80fb39d3f42e5c89ead0a4f744db9aff509dde20,9ba53e284ea4e7f8e34f045631c9e86698e56954..583c603f1b6c8123f3f0dc4abdee6e70a6c5e377
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,6 -1,6 +1,6 @@@
  dnl Process this file with autoconf to produce a configure script.
  dnl
- AC_INIT([linux nfs-utils],[1.2.5],[linux-nfs@vger.kernel.org],[nfs-utils])
+ AC_INIT([linux nfs-utils],[1.2.6],[linux-nfs@vger.kernel.org],[nfs-utils])
  AC_CANONICAL_BUILD([])
  AC_CANONICAL_HOST([])
  AC_CONFIG_MACRO_DIR(aclocal)
@@@ -24,9 -24,8 +24,8 @@@ AC_ARG_WITH(statedir
        statedir=/var/lib/nfs)
        AC_SUBST(statedir)
  AC_ARG_WITH(statdpath,
-       [AC_HELP_STRING([--with-statdpath=/foo @<:@default=/var/lib/nfs@:>@],
-               [define statd's state dir as /foo instead of the NFS statedir]
-       )],
+       [AC_HELP_STRING([--with-statdpath=/foo],
+                       [define the statd state dir as /foo instead of the NFS statedir @<:@default=/var/lib/nfs@:>@])],
        statdpath=$withval,
        statdpath=$statedir
        )
@@@ -186,6 -185,12 +185,12 @@@ els
        AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"])
  fi
  
+ AC_ARG_ENABLE(nfsdcld,
+       [AC_HELP_STRING([--enable-nfsdcld],
+                       [Create nfsdcld NFSv4 clientid tracking daemon. @<:@default=no@:>@])],
+       enable_nfsdcld=$enableval,
+       enable_nfsdcld="no")
+ 
  dnl Check for TI-RPC library and headers
  AC_LIBTIRPC
  
@@@ -249,6 -254,8 +254,8 @@@ AC_CHECK_FUNC([getservbyname], 
  
  AC_CHECK_LIB([crypt], [crypt], [LIBCRYPT="-lcrypt"])
  
+ AC_CHECK_LIB([dl], [dlclose], [LIBDL="-ldl"])
+ 
  if test "$enable_nfsv4" = yes; then
    dnl check for libevent libraries and headers
    AC_LIBEVENT
@@@ -259,16 -266,36 +266,39 @@@
    dnl check for the keyutils libraries and headers
    AC_KEYUTILS
  
+   dnl Check for sqlite3
+   AC_SQLITE3_VERS
+ 
+   if test "$enable_nfsdcld" = "yes"; then
+       AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
+               AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
+ 
+       if test "$libsqlite3_cv_is_recent" != "yes" ; then
+               AC_MSG_ERROR([nfsdcld requires sqlite3])
+       fi
+   fi
+ 
+   AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+ 
    dnl librpcsecgss already has a dependency on libgssapi,
    dnl but we need to make sure we get the right version
    if test "$enable_gss" = yes; then
      AC_RPCSEC_VERSION
    fi
  fi
 +dnl enable nfsidmap when its support by libnfsidmap
 +AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
 +
  
+ if test "$enable_nfsv41" = yes; then
+   AC_CHECK_LIB([devmapper], [dm_task_create], [LIBDEVMAPPER="-ldevmapper"], AC_MSG_ERROR([libdevmapper needed]))
+   AC_CHECK_HEADER(libdevmapper.h, , AC_MSG_ERROR([Cannot find devmapper header file libdevmapper.h]))
+ fi
+ 
+ dnl enable nfsidmap when its support by libnfsidmap
+ AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+ 
+ 
  if test "$knfsd_cv_glibc2" = no; then
      AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
  fi
@@@ -293,6 -320,7 +323,7 @@@ AC_SUBST(LIBSOCKET
  AC_SUBST(LIBCRYPT)
  AC_SUBST(LIBBSD)
  AC_SUBST(LIBBLKID)
+ AC_SUBST(LIBDL)
  
  if test "$enable_libmount" != no; then
     AC_CHECK_LIB(mount, mnt_context_do_mount, [LIBMOUNT="-lmount"], AC_MSG_ERROR([libmount needed]))
@@@ -308,9 -336,6 +339,6 @@@ if test "$enable_gss" = yes; the
    dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c
    AC_LIBNFSIDMAP
  
-   AC_CHECK_HEADERS([spkm3.h], ,
-                    [AC_MSG_WARN([Could not locate SPKM3 header; will not have SPKM3 support])])
- 
    dnl Check for Kerberos V5
    AC_KERBEROS_V5
  
@@@ -330,7 -355,7 +358,7 @@@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h l
                   stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                   sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                   syslog.h unistd.h com_err.h et/com_err.h \
-                  ifaddrs.h])
+                  ifaddrs.h nfs-plugin.h])
  
  dnl *************************************************************
  dnl Checks for typedefs, structures, and compiler characteristics
@@@ -452,6 -477,7 +480,7 @@@ AC_CONFIG_FILES(
        tools/nfs-iostat/Makefile
        utils/Makefile
        utils/blkmapd/Makefile
+       utils/nfsdcld/Makefile
        utils/exportfs/Makefile
        utils/gssd/Makefile
        utils/idmapd/Makefile
@@@ -462,6 -488,7 +491,7 @@@
        utils/nfsidmap/Makefile
        utils/showmount/Makefile
        utils/statd/Makefile
+       utils/osd_login/Makefile
        tests/Makefile
        tests/nsm_client/Makefile])
  AC_OUTPUT