From ecee18894b841d74ea824dd0a20cc9ec67f8fa38 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 10 2021 04:20:12 +0000
Subject: import nfs-utils-2.3.3-48.el8


---

diff --git a/SOURCES/nfs-utils-2.3.3-gssd-printerr.patch b/SOURCES/nfs-utils-2.3.3-gssd-printerr.patch
new file mode 100644
index 0000000..0e564b1
--- /dev/null
+++ b/SOURCES/nfs-utils-2.3.3-gssd-printerr.patch
@@ -0,0 +1,14 @@
+diff -up nfs-utils-2.3.3/utils/gssd/krb5_util.c.orig nfs-utils-2.3.3/utils/gssd/krb5_util.c
+--- nfs-utils-2.3.3/utils/gssd/krb5_util.c.orig	2021-11-04 10:13:07.788142847 -0400
++++ nfs-utils-2.3.3/utils/gssd/krb5_util.c	2021-11-04 10:14:10.829841090 -0400
+@@ -647,8 +647,8 @@ get_full_hostname(const char *inhost, ch
+ 	    *c = tolower(*c);
+ 
+ 	if (get_verbosity() && strcmp(inhost, outhost))
+-		printerr(1, "%s(0x%0lx): inhost '%s' different than outhost'%s'\n", 
+-			inhost, outhost);
++		printerr(1, "%s(0x%0lx): inhost '%s' different than outhost '%s'\n", 
++			 __func__, tid, inhost, outhost);
+ 
+ 	retval = 0;
+ out:
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index 72e24c7..5a2c7a1 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/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.3.3
-Release: 47%{?dist}
+Release: 48%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -88,6 +88,7 @@ Patch045: nfs-utils-2.3.3-gssd-mutex-refcnt.patch
 #
 # RHEL 8.6
 Patch046: nfs-utils-2.3.3-mountd-v4-logging.patch
+Patch047: nfs-utils-2.3.3-gssd-printerr.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -363,6 +364,9 @@ fi
 %{_libdir}/libnfsidmap.so
 
 %changelog
+* Thu Nov 4 2021 Steve Dickson <steved@redhat.com> 2.3.3-48
+- gssd: fix crash in debug message (bz 1988283)
+
 * Tue Nov 2 2021 Steve Dickson <steved@redhat.com> 2.3.3-47
 - Enable logging for NFSv4 mount requests (bz 2004151)