rpc.idmapd: Do not free config variables (bz 1873965)

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2020-09-08 14:08:56 -04:00
parent fc682ed0ac
commit 9bda7d5052
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
commit 086e6fdce887dd68e51b7bac4a2f21cea9a4fe01
Author: Steve Dickson <steved@redhat.com>
Date: Fri Sep 4 14:15:53 2020 -0400
rpc.idmapd: Do not free config variables
Commit 93e8f092e added a conf_cleanup() call to clean
up memory after the config file was parsed. It turns
out that memory still needed and it is not very much
so the call is removed.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1873965
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index f3d2314..51c71fb 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -306,9 +306,6 @@ main(int argc, char **argv)
serverstart = 0;
}
- /* Config memory is no longer needed */
- conf_cleanup();
-
while ((opt = getopt(argc, argv, GETOPTSTR)) != -1)
switch (opt) {
case 'v':

View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://linux-nfs.org/ URL: http://linux-nfs.org/
Version: 2.5.1 Version: 2.5.1
Release: 3.rc4%{?dist} Release: 4.rc4%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -17,6 +17,7 @@ Source5: nfsconvert.sh
Source6: nfs-convert.service Source6: nfs-convert.service
Patch001: nfs-utils-2.5.2-rc4.patch Patch001: nfs-utils-2.5.2-rc4.patch
Patch002: nfs-utils-2.5.1-rpcidmap-dontfreeconfig.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -365,6 +366,9 @@ fi
%{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount %{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
%changelog %changelog
* Tue Sep 08 2020 Steve Dickson <steved@redhat.com> 2.5.2-4.rc4
- rpc.idmapd: Do not free config variables (bz 1873965)
* Mon Aug 31 2020 Steve Dickson <steved@redhat.com> 2.5.2-3.rc4 * Mon Aug 31 2020 Steve Dickson <steved@redhat.com> 2.5.2-3.rc4
- Fixed rpc.gssd: munmap_chunk(): invalid pointer - Fixed rpc.gssd: munmap_chunk(): invalid pointer