From 09cb5d0925bdc7c2868ef14c8df6f1798eabd16c Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Sat, 29 Jan 2022 14:56:31 +0800 Subject: [PATCH] nfs-utils: set use-gss-proxy=1 to enable gss-proxy by default In commit 104f90f4ce ('gssd: Introduce use-gss-proxy boolean to nfs.conf'), use-gss-proxy par in [gssd] section of nfs.conf is introduced to allow the used of the gssprox-mech. However, the default value of use-gss-proxy is false, which cause different behavor with older version. In order to be consistent with the old versions, here we set use-gss-proxy to true in nfs.conf. Signed-off-by: Zhiqiang Liu (cherry picked from commit 8d42341c703ce6702bd111d27632d7d21c74b3c6) --- ...e-gss-proxy-1-to-enable-gss-proxy-by.patch | 35 +++++++++++++++++++ nfs-utils.spec | 7 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch diff --git a/0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch b/0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch new file mode 100644 index 0000000..8787db6 --- /dev/null +++ b/0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch @@ -0,0 +1,35 @@ +From 2d1df7efe8e178721be9177e8ee0622e29991950 Mon Sep 17 00:00:00 2001 +From: Zhiqiang Liu +Date: Sat, 29 Jan 2022 14:40:18 +0800 +Subject: [PATCH] nfs-utils: set use-gss-proxy=1 to enable gss-proxy by default + +In commit 104f90f4ce ('gssd: Introduce use-gss-proxy boolean to nfs.conf'), +use-gss-proxy par in [gssd] section of nfs.conf is introduced to +allow the used of the gssprox-mech. However, the default value +of use-gss-proxy is false, which cause different behavor with older +version. + +In order to be consistent with the old versions, here we set +use-gss-proxy to true in nfs.conf. + +Signed-off-by: Zhiqiang Liu +--- + nfs.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nfs.conf b/nfs.conf +index 186a5b1..955abea 100644 +--- a/nfs.conf ++++ b/nfs.conf +@@ -16,7 +16,7 @@ + # rpc-verbosity=0 + # use-memcache=0 + # use-machine-creds=1 +-# use-gss-proxy=0 ++use-gss-proxy=0 + # avoid-dns=1 + # limit-to-legacy-enctypes=0 + # context-timeout=0 +-- +1.8.3.1 + diff --git a/nfs-utils.spec b/nfs-utils.spec index ee97982..5ab88c0 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -4,7 +4,7 @@ Name: nfs-utils Version: 2.5.4 -Release: 1 +Release: 2 Epoch: 1 Summary: The Linux NFS userland utility package License: MIT and GPLv2 and GPLv2+ and BSD @@ -14,6 +14,7 @@ Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{v Patch0: 0000-systemd-idmapd-require-rpc-pipefs.patch Patch1: 0001-correct-the-statd-path-in-man.patch +Patch2: 0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch BuildRequires: libevent-devel,libcap-devel, libtirpc-devel libblkid-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 @@ -225,6 +226,10 @@ fi %{_mandir}/*/* %changelog +* Sat Jan 29 2022 Zhiqiang Liu - 2.5.4-2 +- In order to be consistent with the old versions, here we set + use-gss-proxy to true in nfs.conf. + * Thu Nov 18 2021 Wenchao Hao - 2.5.4-1 - update nfs-utils version to 2.5.4-1 -- Gitee