From 9bda7d5052905d437629a68cc0f982f2f8db43b5 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Sep 08 2020 18:08:56 +0000
Subject: rpc.idmapd: Do not free config variables (bz 1873965)


Signed-off-by: Steve Dickson <steved@redhat.com>

---

diff --git a/nfs-utils-2.5.1-rpcidmap-dontfreeconfig.patch b/nfs-utils-2.5.1-rpcidmap-dontfreeconfig.patch
new file mode 100644
index 0000000..de7241d
--- /dev/null
+++ b/nfs-utils-2.5.1-rpcidmap-dontfreeconfig.patch
@@ -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':
diff --git a/nfs-utils.spec b/nfs-utils.spec
index f4dd7ed..79bd471 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://linux-nfs.org/
 Version: 2.5.1
-Release: 3.rc4%{?dist}
+Release: 4.rc4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -17,6 +17,7 @@ Source5: nfsconvert.sh
 Source6: nfs-convert.service
 
 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
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -365,6 +366,9 @@ fi
 %{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
 
 %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
 - Fixed rpc.gssd: munmap_chunk(): invalid pointer