Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2025-02-10 17:22:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new.19470 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils" Mon Feb 10 17:22:52 2025 rev:185 rq:1244414 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2025-01-31 16:02:33.399426114 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new.19470/nfs-utils.changes 2025-02-10 18:16:02.304296979 +0100 @@ -1,0 +2,17 @@ +Sat Feb 8 21:30:47 UTC 2025 - Dirk Müller <[email protected]> + +- update to 2.8.2: + * exports: Fix referrals when --enable-junction=no + * nfsidmap(v2): Add guards around [nfsidmap] usages of [sysconf]. + * libnsm(v2): fix the safer atomic filenames fix + * libnsm: fix the safer atomic filenames fix + * nfsd: dump default number of threads to 16 + * autoconf: don't build nfsdcltrack by default + * nfs(5): Update rsize/wsize options + * nfsdctl: clarify when versions can be set on the man page + * nfsdctl: fix up the help text in version_usage() + * libnsm: safer atomic filenames + * nfs-utils: fixup statd testing simulator host arg + * mount.nfs: retry NFSv3 mount after NFSv4 failure in auto negotiation + +------------------------------------------------------------------- Old: ---- nfs-utils-2.8.1.tar.xz New: ---- nfs-utils-2.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.HhgsVk/_old 2025-02-10 18:16:03.164332675 +0100 +++ /var/tmp/diff_new_pack.HhgsVk/_new 2025-02-10 18:16:03.168332840 +0100 @@ -1,7 +1,7 @@ # # spec file for package nfs-utils # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: nfs-utils -Version: 2.8.1 +Version: 2.8.2 Release: 0 Summary: Support Utilities for Kernel nfsd License: GPL-2.0-or-later ++++++ nfs-utils-2.8.1.tar.xz -> nfs-utils-2.8.2.tar.xz ++++++ ++++ 12042 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/configure.ac new/nfs-utils-2.8.2/configure.ac --- old/nfs-utils-2.8.1/configure.ac 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/configure.ac 2024-12-10 13:53:38.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT([linux nfs-utils],[2.8.1],[[email protected]],[nfs-utils]) +AC_INIT([linux nfs-utils],[2.8.2],[[email protected]],[nfs-utils]) AC_CANONICAL_BUILD([]) AC_CANONICAL_HOST([]) AC_CONFIG_MACRO_DIR(aclocal) @@ -248,9 +248,9 @@ fi AC_ARG_ENABLE(nfsdcltrack, - [AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])], + [AS_HELP_STRING([--enable-nfsdcltrack],[enable NFSv4 clientid tracking programs @<:@default=no@:>@])], enable_nfsdcltrack=$enableval, - enable_nfsdcltrack="yes") + enable_nfsdcltrack="no") AC_ARG_ENABLE(nfsdctl, [AS_HELP_STRING([--disable-nfsdctl],[disable nfsdctl program for controlling nfsd@<:@default=no@:>@])], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/nfs.conf new/nfs-utils-2.8.2/nfs.conf --- old/nfs-utils-2.8.1/nfs.conf 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/nfs.conf 2024-12-10 13:53:38.000000000 +0100 @@ -66,7 +66,7 @@ # [nfsd] # debug=0 -# threads=8 +# threads=16 # host= # port=0 # grace-time=90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/export/cache.c new/nfs-utils-2.8.2/support/export/cache.c --- old/nfs-utils-2.8.1/support/export/cache.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/export/cache.c 2024-12-10 13:53:38.000000000 +0100 @@ -34,10 +34,7 @@ #include "pseudoflavors.h" #include "xcommon.h" #include "reexport.h" - -#ifdef HAVE_JUNCTION_SUPPORT #include "fsloc.h" -#endif #ifdef USE_BLKID #include "blkid/blkid.h" @@ -999,7 +996,6 @@ *dp = d; } -#ifdef HAVE_JUNCTION_SUPPORT static void write_fsloc(char **bp, int *blen, struct exportent *ep) { struct servers *servers; @@ -1022,7 +1018,6 @@ qword_addint(bp, blen, servers->h_referral); release_replicas(servers); } -#endif static void write_secinfo(char **bp, int *blen, struct exportent *ep, int flag_mask, int extra_flag) { @@ -1120,9 +1115,7 @@ qword_addint(&bp, &blen, exp->e_anongid); qword_addint(&bp, &blen, fsidnum); -#ifdef HAVE_JUNCTION_SUPPORT write_fsloc(&bp, &blen, exp); -#endif write_secinfo(&bp, &blen, exp, flag_mask, do_fsidnum ? NFSEXP_FSID : 0); if (exp->e_uuid == NULL || different_fs) { char u[16]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/include/config.h.in new/nfs-utils-2.8.2/support/include/config.h.in --- old/nfs-utils-2.8.1/support/include/config.h.in 2024-10-19 14:50:02.000000000 +0200 +++ new/nfs-utils-2.8.2/support/include/config.h.in 2024-12-10 13:54:37.000000000 +0100 @@ -1,6 +1,6 @@ /* support/include/config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if the `closedir' function returns void instead of int. */ +/* Define to 1 if the 'closedir' function returns void instead of int. */ #undef CLOSEDIR_VOID /* Define to 1 if using 'alloca.c'. */ @@ -15,11 +15,11 @@ /* Enable LDAP SASL support */ #undef ENABLE_LDAP_SASL -/* Define to the type of elements in the array set by `getgroups'. Usually - this is either `int' or `gid_t'. */ +/* Define to the type of elements in the array argument to 'getgroups'. + Usually this is either 'int' or 'gid_t'. */ #undef GETGROUPS_T -/* Define to 1 if you have the `alarm' function. */ +/* Define to 1 if you have the 'alarm' function. */ #undef HAVE_ALARM /* Define to 1 if you have 'alloca', as a function or macro. */ @@ -31,7 +31,7 @@ /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H -/* Define to 1 if you have the `atexit' function. */ +/* Define to 1 if you have the 'atexit' function. */ #undef HAVE_ATEXIT /* Define to 1 if your rpcsec library provides authgss_free_private_data */ @@ -43,17 +43,17 @@ /* Define to 1 if you have the <com_err.h> header file. */ #undef HAVE_COM_ERR_H -/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. +/* Define to 1 if you have the <dirent.h> header file, and it defines 'DIR'. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* Define to 1 if you don't have 'vprintf' but do have '_doprnt.' */ #undef HAVE_DOPRNT -/* Define to 1 if you have the `dup2' function. */ +/* Define to 1 if you have the 'dup2' function. */ #undef HAVE_DUP2 /* Define to 1 if you have the <et/com_err.h> header file. */ @@ -65,61 +65,61 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H -/* Define to 1 if you have the `fdatasync' function. */ +/* Define to 1 if you have the 'fdatasync' function. */ #undef HAVE_FDATASYNC /* Define to 1 if you have the `find_key_by_type_and_desc' function. */ #undef HAVE_FIND_KEY_BY_TYPE_AND_DESC -/* Define to 1 if you have the `fork' function. */ +/* Define to 1 if you have the 'fork' function. */ #undef HAVE_FORK -/* Define to 1 if you have the `fstatat' function. */ +/* Define to 1 if you have the 'fstatat' function. */ #undef HAVE_FSTATAT -/* Define to 1 if you have the `ftruncate' function. */ +/* Define to 1 if you have the 'ftruncate' function. */ #undef HAVE_FTRUNCATE /* Define to 1 if the system has the `format' function attribute */ #undef HAVE_FUNC_ATTRIBUTE_FORMAT -/* Define to 1 if you have the `getcwd' function. */ +/* Define to 1 if you have the 'getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if your system has a working `getgroups' function. */ +/* Define to 1 if your system has a working 'getgroups' function. */ #undef HAVE_GETGROUPS -/* Define to 1 if you have the `gethostbyaddr' function. */ +/* Define to 1 if you have the 'gethostbyaddr' function. */ #undef HAVE_GETHOSTBYADDR -/* Define to 1 if you have the `gethostbyname' function. */ +/* Define to 1 if you have the 'gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME -/* Define to 1 if you have the `gethostname' function. */ +/* Define to 1 if you have the 'gethostname' function. */ #undef HAVE_GETHOSTNAME -/* Define to 1 if you have the `getifaddrs' function. */ +/* Define to 1 if you have the 'getifaddrs' function. */ #undef HAVE_GETIFADDRS -/* Define to 1 if you have the `getmntent' function. */ +/* Define to 1 if you have the 'getmntent' function. */ #undef HAVE_GETMNTENT -/* Define to 1 if you have the `getnameinfo' function. */ +/* Define to 1 if you have the 'getnameinfo' function. */ #undef HAVE_GETNAMEINFO /* Define to 1 if you have the `getrandom' function. */ #undef HAVE_GETRANDOM -/* Define to 1 if you have the `getrpcbyname' function. */ +/* Define to 1 if you have the 'getrpcbyname' function. */ #undef HAVE_GETRPCBYNAME -/* Define to 1 if you have the `getrpcbynumber' function. */ +/* Define to 1 if you have the 'getrpcbynumber' function. */ #undef HAVE_GETRPCBYNUMBER -/* Define to 1 if you have the `getrpcbynumber_r' function. */ +/* Define to 1 if you have the 'getrpcbynumber_r' function. */ #undef HAVE_GETRPCBYNUMBER_R -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define to 1 if you have the 'gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY /* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */ @@ -144,7 +144,7 @@ gss_krb5_free_lucid_sec_context */ #undef HAVE_GSS_KRB5_FREE_LUCID_SEC_CONTEXT -/* Define to 1 if you have the `hasmntopt' function. */ +/* Define to 1 if you have the 'hasmntopt' function. */ #undef HAVE_HASMNTOPT /* Define this if you have Heimdal Kerberos libraries */ @@ -153,10 +153,10 @@ /* Define to 1 if you have the <ifaddrs.h> header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `inet_ntoa' function. */ +/* Define to 1 if you have the 'inet_ntoa' function. */ #undef HAVE_INET_NTOA -/* Define to 1 if you have the `innetgr' function. */ +/* Define to 1 if you have the 'innetgr' function. */ #undef HAVE_INNETGR /* Define to 1 if you have the <inttypes.h> header file. */ @@ -187,7 +187,7 @@ /* Define to 1 if you have the <libgen.h> header file. */ #undef HAVE_LIBGEN_H -/* Define to 1 if you have the `gssglue' library (-lgssglue). */ +/* Define to 1 if you have the 'gssglue' library (-lgssglue). */ #undef HAVE_LIBGSSGLUE /* Define to 1 if you have the <libintl.h> header file. */ @@ -196,7 +196,7 @@ /* Define to 1 if you have libpthread. */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `resolv' library (-lresolv). */ +/* Define to 1 if you have the 'resolv' library (-lresolv). */ #undef HAVE_LIBRESOLV /* Define to 1 if you have and wish to use libtirpc. */ @@ -217,7 +217,7 @@ /* Define to 1 if you have the <linux/nfsd_netlink.h> header file. */ #undef HAVE_LINUX_NFSD_NETLINK_H -/* Define to 1 if `lstat' has the bug that it succeeds when given the +/* Define to 1 if 'lstat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_LSTAT_EMPTY_STRING_BUG @@ -231,19 +231,19 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `memset' function. */ +/* Define to 1 if you have the 'memset' function. */ #undef HAVE_MEMSET /* Define to 1 if you have the <minix/config.h> header file. */ #undef HAVE_MINIX_CONFIG_H -/* Define to 1 if you have the `mkdir' function. */ +/* Define to 1 if you have the 'mkdir' function. */ #undef HAVE_MKDIR -/* Define to 1 if you have the `name_to_handle_at' function. */ +/* Define to 1 if you have the 'name_to_handle_at' function. */ #undef HAVE_NAME_TO_HANDLE_AT -/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ +/* Define to 1 if you have the <ndir.h> header file, and it defines 'DIR'. */ #undef HAVE_NDIR_H /* Define to 1 if you have the <netdb.h> header file. */ @@ -258,22 +258,22 @@ /* Define this if you want NFSv4 server only support compiled in */ #undef HAVE_NFSV4SERVER_SUPPORT -/* Define to 1 if you have the `pathconf' function. */ +/* Define to 1 if you have the 'pathconf' function. */ #undef HAVE_PATHCONF /* Define to 1 if you have the <paths.h> header file. */ #undef HAVE_PATHS_H -/* Define to 1 if you have the `ppoll' function. */ +/* Define to 1 if you have the 'ppoll' function. */ #undef HAVE_PPOLL /* Define to 1 if you have the <pthread.h> header file. */ #undef HAVE_PTHREAD_H -/* Define to 1 if you have the `realpath' function. */ +/* Define to 1 if you have the 'realpath' function. */ #undef HAVE_REALPATH -/* Define to 1 if you have the `rmdir' function. */ +/* Define to 1 if you have the 'rmdir' function. */ #undef HAVE_RMDIR /* Define to 1 if you have the <sasl.h> header file. */ @@ -285,26 +285,26 @@ /* Define to 1 if you have the <sched.h> header file. */ #undef HAVE_SCHED_H -/* Define to 1 if you have the `select' function. */ +/* Define to 1 if you have the 'select' function. */ #undef HAVE_SELECT /* Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes */ #undef HAVE_SET_ALLOWABLE_ENCTYPES -/* Define to 1 if you have the `sigprocmask' function. */ +/* Define to 1 if you have the 'sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if you have the `socket' function. */ +/* Define to 1 if you have the 'socket' function. */ #undef HAVE_SOCKET /* Define to 1 if you have the <sqlite3.h> header file. */ #undef HAVE_SQLITE3_H -/* Define to 1 if you have the `statx' function. */ +/* Define to 1 if you have the 'statx' function. */ #undef HAVE_STATX -/* Define to 1 if `stat' has the bug that it succeeds when given the +/* Define to 1 if 'stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -317,16 +317,16 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ +/* Define to 1 if you have the 'strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define to 1 if you have the `strchr' function. */ +/* Define to 1 if you have the 'strchr' function. */ #undef HAVE_STRCHR -/* Define to 1 if you have the `strdup' function. */ +/* Define to 1 if you have the 'strdup' function. */ #undef HAVE_STRDUP -/* Define to 1 if you have the `strerror' function. */ +/* Define to 1 if you have the 'strerror' function. */ #undef HAVE_STRERROR /* Define to 1 if you have the <strings.h> header file. */ @@ -335,16 +335,16 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strrchr' function. */ +/* Define to 1 if you have the 'strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strtol' function. */ +/* Define to 1 if you have the 'strtol' function. */ #undef HAVE_STRTOL -/* Define to 1 if you have the `strtoul' function. */ +/* Define to 1 if you have the 'strtoul' function. */ #undef HAVE_STRTOUL -/* Define to 1 if the system has the type `struct file_handle'. */ +/* Define to 1 if the system has the type 'struct file_handle'. */ #undef HAVE_STRUCT_FILE_HANDLE /* Define to 1 if you have the <syslog.h> header file. */ @@ -353,7 +353,7 @@ /* Define to 1 if you have the <sys/capability.h> header file. */ #undef HAVE_SYS_CAPABILITY_H -/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. +/* Define to 1 if you have the <sys/dir.h> header file, and it defines 'DIR'. */ #undef HAVE_SYS_DIR_H @@ -369,7 +369,7 @@ /* Define to 1 if you have the <sys/mount.h> header file. */ #undef HAVE_SYS_MOUNT_H -/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines 'DIR'. */ #undef HAVE_SYS_NDIR_H @@ -403,25 +403,25 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `unshare' function. */ +/* Define to 1 if you have the 'unshare' function. */ #undef HAVE_UNSHARE -/* Define to 1 if you have the `vfork' function. */ +/* Define to 1 if you have the 'vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the <vfork.h> header file. */ #undef HAVE_VFORK_H -/* Define to 1 if you have the `vprintf' function. */ +/* Define to 1 if you have the 'vprintf' function. */ #undef HAVE_VPRINTF /* Define to 1 if you have the <wchar.h> header file. */ #undef HAVE_WCHAR_H -/* Define to 1 if `fork' works. */ +/* Define to 1 if 'fork' works. */ #undef HAVE_WORKING_FORK -/* Define to 1 if `vfork' works. */ +/* Define to 1 if 'vfork' works. */ #undef HAVE_WORKING_VFORK /* Define this if you want IPv6 support compiled in */ @@ -433,18 +433,18 @@ /* tcp-wrapper */ #undef LIBWRAP -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing +/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR -/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. +/* Define to 1 if 'major', 'minor', and 'makedev' are declared in <mkdev.h>. */ #undef MAJOR_IN_MKDEV -/* Define to 1 if `major', `minor', and `makedev' are declared in +/* Define to 1 if 'major', 'minor', and 'makedev' are declared in <sysmacros.h>. */ #undef MAJOR_IN_SYSMACROS @@ -488,28 +488,28 @@ /* Define this to change the plugins path */ #undef PATH_PLUGINS -/* Define to the type of arg 1 for `select'. */ +/* Define to the type of arg 1 for 'select'. */ #undef SELECT_TYPE_ARG1 -/* Define to the type of args 2, 3 and 4 for `select'. */ +/* Define to the type of args 2, 3 and 4 for 'select'. */ #undef SELECT_TYPE_ARG234 -/* Define to the type of arg 5 for `select'. */ +/* Define to the type of arg 5 for 'select'. */ #undef SELECT_TYPE_ARG5 -/* The size of `int', as computed by sizeof. */ +/* The size of 'int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of `long', as computed by sizeof. */ +/* The size of 'long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `short', as computed by sizeof. */ +/* The size of 'short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* The size of `size_t', as computed by sizeof. */ +/* The size of 'size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `socklen_t', as computed by sizeof. */ +/* The size of 'socklen_t', as computed by sizeof. */ #undef SIZEOF_SOCKLEN_T /* If using the C implementation of alloca, define if you know the @@ -523,18 +523,18 @@ /* Define this to a script which can start statd on mount */ #undef START_STATD -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Define to 1 if your <sys/time.h> declares `struct tm'. */ +/* Define to 1 if your <sys/time.h> declares 'struct tm'. */ #undef TM_IN_SYS_TIME /* Define if you want to use blkid to find uuid of filesystems */ #undef USE_BLKID -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -595,11 +595,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -631,32 +635,38 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES -/* Define to empty if `const' does not conform to ANSI C. */ +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT + +/* Define to empty if 'const' does not conform to ANSI C. */ #undef const -/* Define to `int' if <sys/types.h> doesn't define. */ +/* Define as 'int' if <sys/types.h> doesn't define. */ #undef gid_t -/* Define to `__inline__' or `__inline' if that's what the C compiler +/* Define to '__inline__' or '__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif -/* Define to `long int' if <sys/types.h> does not define. */ +/* Define to 'long int' if <sys/types.h> does not define. */ #undef off_t /* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define as 'unsigned int' if <stddef.h> doesn't define. */ #undef size_t -/* Define to `int' if <sys/types.h> doesn't define. */ +/* Define as 'int' if <sys/types.h> doesn't define. */ #undef uid_t -/* Define as `fork' if `vfork' does not work. */ +/* Define as 'fork' if 'vfork' does not work. */ #undef vfork diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/gums.c new/nfs-utils-2.8.2/support/nfsidmap/gums.c --- old/nfs-utils-2.8.1/support/nfsidmap/gums.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/gums.c 2024-12-10 13:53:38.000000000 +0100 @@ -475,7 +475,7 @@ int ret = -1; struct passwd *pw = NULL; struct pwbuf *buf = NULL; - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); buf = malloc(sizeof(*buf) + buflen); if (buf == NULL) @@ -501,7 +501,7 @@ struct group *gr = NULL; struct group grbuf; char *buf = NULL; - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); int ret = -1; do { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/libnfsidmap.c new/nfs-utils-2.8.2/support/nfsidmap/libnfsidmap.c --- old/nfs-utils-2.8.1/support/nfsidmap/libnfsidmap.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/libnfsidmap.c 2024-12-10 13:53:38.000000000 +0100 @@ -457,7 +457,7 @@ nobody_user = conf_get_str("Mapping", "Nobody-User"); if (nobody_user) { - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); struct passwd *buf; struct passwd *pw = NULL; int err; @@ -478,7 +478,7 @@ nobody_group = conf_get_str("Mapping", "Nobody-Group"); if (nobody_group) { - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); struct group *buf; struct group *gr = NULL; int err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/nfsidmap_common.c new/nfs-utils-2.8.2/support/nfsidmap/nfsidmap_common.c --- old/nfs-utils-2.8.1/support/nfsidmap/nfsidmap_common.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/nfsidmap_common.c 2024-12-10 13:53:38.000000000 +0100 @@ -116,3 +116,19 @@ return reformat_group; } + +size_t get_pwnam_buflen(void) +{ + long buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + if (buflen == -1) + buflen = 16384; + return (size_t)buflen; +} + +size_t get_grnam_buflen(void) +{ + long buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + if (buflen == -1) + buflen = 16384; + return (size_t)buflen; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/nfsidmap_private.h new/nfs-utils-2.8.2/support/nfsidmap/nfsidmap_private.h --- old/nfs-utils-2.8.1/support/nfsidmap/nfsidmap_private.h 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/nfsidmap_private.h 2024-12-10 13:53:38.000000000 +0100 @@ -40,6 +40,8 @@ void free_local_realms(void); int get_nostrip(void); int get_reformat_group(void); +size_t get_pwnam_buflen(void); +size_t get_grnam_buflen(void); typedef enum { IDTYPE_USER = 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/nss.c new/nfs-utils-2.8.2/support/nfsidmap/nss.c --- old/nfs-utils-2.8.1/support/nfsidmap/nss.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/nss.c 2024-12-10 13:53:38.000000000 +0100 @@ -91,7 +91,7 @@ struct passwd *pw = NULL; struct passwd pwbuf; char *buf; - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); int err = -ENOMEM; buf = malloc(buflen); @@ -119,7 +119,7 @@ struct group *gr = NULL; struct group grbuf; char *buf; - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); int err; if (domain == NULL) @@ -192,7 +192,7 @@ { struct passwd *pw; struct pwbuf *buf; - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); char *localname; int err = ENOMEM; @@ -301,7 +301,7 @@ struct group *gr = NULL; struct group grbuf; char *buf, *domain; - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); int err = -EINVAL; char *localname = NULL; char *ref_name = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/regex.c new/nfs-utils-2.8.2/support/nfsidmap/regex.c --- old/nfs-utils-2.8.1/support/nfsidmap/regex.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/regex.c 2024-12-10 13:53:38.000000000 +0100 @@ -46,6 +46,7 @@ #include "nfsidmap.h" #include "nfsidmap_plugin.h" +#include "nfsidmap_private.h" #define CONFIG_GET_STRING nfsidmap_config_get extern const char *nfsidmap_config_get(const char *, const char *); @@ -95,7 +96,7 @@ { struct passwd *pw; struct pwbuf *buf; - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); char *localname; size_t namelen; int err; @@ -175,7 +176,7 @@ { struct group *gr; struct grbuf *buf; - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); char *localgroup; char *groupname; size_t namelen; @@ -366,7 +367,7 @@ struct passwd *pw = NULL; struct passwd pwbuf; char *buf; - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); int err = -ENOMEM; buf = malloc(buflen); @@ -392,7 +393,7 @@ struct group grbuf; char *buf; const char *name_prefix; - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); int err; char * groupname = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nfsidmap/static.c new/nfs-utils-2.8.2/support/nfsidmap/static.c --- old/nfs-utils-2.8.1/support/nfsidmap/static.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nfsidmap/static.c 2024-12-10 13:53:38.000000000 +0100 @@ -44,6 +44,7 @@ #include "conffile.h" #include "nfsidmap.h" #include "nfsidmap_plugin.h" +#include "nfsidmap_private.h" /* * Static Translation Methods @@ -98,7 +99,7 @@ { struct passwd *pw; struct pwbuf *buf; - size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t buflen = get_pwnam_buflen(); char *localname; int err; @@ -149,7 +150,7 @@ { struct group *gr; struct grbuf *buf; - size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t buflen = get_grnam_buflen(); char *localgroup; int err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/nsm/file.c new/nfs-utils-2.8.2/support/nsm/file.c --- old/nfs-utils-2.8.1/support/nsm/file.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/nsm/file.c 2024-12-10 13:53:38.000000000 +0100 @@ -184,10 +184,10 @@ nsm_make_temp_pathname(const char *pathname) { size_t size; - char *path; + char *path, *base; int len; - size = strlen(pathname) + sizeof(".new") + 2; + size = strlen(pathname) + sizeof(".new") + 1; if (size > PATH_MAX) return NULL; @@ -195,12 +195,20 @@ if (path == NULL) return NULL; - len = snprintf(path, size, "%s.new", pathname); + base = strrchr(pathname, '/'); + if (base == NULL) + base = pathname; + else + base++; + + strcpy(path, pathname); + len = base - pathname; + len += snprintf(path + len, size - len, ".%s.new", base); + if (error_check(len, size)) { free(path); return NULL; } - return path; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/support/reexport/reexport.h new/nfs-utils-2.8.2/support/reexport/reexport.h --- old/nfs-utils-2.8.1/support/reexport/reexport.h 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/support/reexport/reexport.h 2024-12-10 13:53:38.000000000 +0100 @@ -1,6 +1,8 @@ #ifndef REEXPORT_H #define REEXPORT_H +#include <unistd.h> + #include "nfslib.h" enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/tests/nsm_client/nsm_client.c new/nfs-utils-2.8.2/tests/nsm_client/nsm_client.c --- old/nfs-utils-2.8.1/tests/nsm_client/nsm_client.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/tests/nsm_client/nsm_client.c 2024-12-10 13:53:38.000000000 +0100 @@ -72,7 +72,7 @@ static struct option longopts[] = { { "help", 0, 0, 'h' }, - { "host", 0, 0, 'H' }, + { "host", 1, 0, 'H' }, { "name", 1, 0, 'n' }, { "program", 1, 0, 'P' }, { "version", 1, 0, 'v' }, @@ -136,7 +136,7 @@ my_name[0] = '\0'; host[0] = '\0'; - while ((arg = getopt_long(argc, argv, "hHn:P:v:", longopts, + while ((arg = getopt_long(argc, argv, "hH:n:P:v:", longopts, NULL)) != EOF) { switch (arg) { case 'H': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/mount/Makefile.am new/nfs-utils-2.8.2/utils/mount/Makefile.am --- old/nfs-utils-2.8.1/utils/mount/Makefile.am 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/mount/Makefile.am 2024-12-10 13:53:38.000000000 +0100 @@ -50,7 +50,7 @@ ln -sf mount.nfs mount.nfs4 && \ ln -sf mount.nfs umount.nfs && \ ln -sf mount.nfs umount.nfs4 && \ - chmod 4511 mount.nfs ) + chmod 4711 mount.nfs ) uninstall-hook: (cd $(DESTDIR)$(sbindir) && \ rm -f mount.nfs4 umount.nfs umount.nfs4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/mount/nfs.man new/nfs-utils-2.8.2/utils/mount/nfs.man --- old/nfs-utils-2.8.1/utils/mount/nfs.man 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/mount/nfs.man 2024-12-10 13:53:38.000000000 +0100 @@ -215,15 +215,18 @@ setting. The largest read payload supported by the Linux NFS client is 1,048,576 bytes (one megabyte). .IP -The +The allowed .B rsize -value is a positive integral multiple of 1024. +value is a positive integral multiple of +system's page size +or a power of two if it is less than +system's page size. Specified .B rsize values lower than 1024 are replaced with 4096; values larger than 1048576 are replaced with 1048576. If a specified value is within the supported -range but not a multiple of 1024, it is rounded down to the nearest -multiple of 1024. +range but not such an allowed value, it is rounded down to the nearest +allowed value. .IP If an .B rsize @@ -257,16 +260,19 @@ is 1,048,576 bytes (one megabyte). .IP Similar to -.B rsize -, the +.BR rsize , +the allowed .B wsize -value is a positive integral multiple of 1024. +value is a positive integral multiple of +system's page size +or a power of two if it is less than +system's page size. Specified .B wsize values lower than 1024 are replaced with 4096; values larger than 1048576 are replaced with 1048576. If a specified value is within the supported -range but not a multiple of 1024, it is rounded down to the nearest -multiple of 1024. +range but not such an allowed value, it is rounded down to the nearest +allowed value. .IP If a .B wsize diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/mount/stropts.c new/nfs-utils-2.8.2/utils/mount/stropts.c --- old/nfs-utils-2.8.1/utils/mount/stropts.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/mount/stropts.c 2024-12-10 13:53:38.000000000 +0100 @@ -981,7 +981,7 @@ if ((result = nfs_try_mount_v3v2(mi, FALSE))) return result; - if (errno != EBUSY && errno != EACCES) + if (errno != EBUSY && errno != EACCES && errno != ETIMEDOUT) errno = olderrno; return result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/nfsd/nfsd.c new/nfs-utils-2.8.2/utils/nfsd/nfsd.c --- old/nfs-utils-2.8.1/utils/nfsd/nfsd.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/nfsd/nfsd.c 2024-12-10 13:53:38.000000000 +0100 @@ -32,7 +32,7 @@ #include "xcommon.h" #ifndef NFSD_NPROC -#define NFSD_NPROC 8 +#define NFSD_NPROC 16 #endif static void usage(const char *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/nfsdctl/nfsdctl.8 new/nfs-utils-2.8.2/utils/nfsdctl/nfsdctl.8 --- old/nfs-utils-2.8.1/utils/nfsdctl/nfsdctl.8 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/nfsdctl/nfsdctl.8 2024-12-10 13:53:38.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: nfsdctl .\" Author: Jeff Layton .\" Generator: Asciidoctor 2.0.20 -.\" Date: 2024-07-22 +.\" Date: 2024-11-18 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "NFSDCTL" "8" "2024-07-22" "\ \&" "\ \&" +.TH "NFSDCTL" "8" "2024-11-18" "\ \&" "\ \&" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -176,6 +176,14 @@ .fam .fi .if n .RE +.sp +.if n .RS 4 +.nf +.fam C +Note that versions can only be set when there are no nfsd threads running. +.fam +.fi +.if n .RE .RE .sp \fBpool\-mode\fP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/nfsdctl/nfsdctl.adoc new/nfs-utils-2.8.2/utils/nfsdctl/nfsdctl.adoc --- old/nfs-utils-2.8.1/utils/nfsdctl/nfsdctl.adoc 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/nfsdctl/nfsdctl.adoc 2024-12-10 13:53:38.000000000 +0100 @@ -93,6 +93,8 @@ The minorversion field is optional. If not given, it will disable or enable all minorversions for that major version. + Note that versions can only be set when there are no nfsd threads running. + *pool-mode*:: Get/set the host's pool mode. This will cause the server to start threads diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nfs-utils-2.8.1/utils/nfsdctl/nfsdctl.c new/nfs-utils-2.8.2/utils/nfsdctl/nfsdctl.c --- old/nfs-utils-2.8.1/utils/nfsdctl/nfsdctl.c 2024-10-19 14:42:10.000000000 +0200 +++ new/nfs-utils-2.8.2/utils/nfsdctl/nfsdctl.c 2024-12-10 13:53:38.000000000 +0100 @@ -764,9 +764,9 @@ printf(" Display currently enabled and disabled versions:\n"); printf(" version\n"); printf(" Disable NFSv4.0:\n"); - printf(" version -v4.0\n"); + printf(" version -4.0\n"); printf(" Enable v4.1, v4.2, disable v2, v3 and v4.0:\n"); - printf(" version -2 -3 -v4.0 +4.1 +v4.2\n"); + printf(" version -2 -3 -4.0 +4.1 +4.2\n"); } static int version_func(struct nl_sock *sock, int argc, char ** argv)
