Revert: gssd.c: Remomved a couple of warning errors

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2018-06-27 14:16:11 -04:00
parent 95594c1be0
commit 9eff41d332
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,43 @@
commit 5743891761f99bdfe6bf89956dab3a0e4c8a0fd0
Author: Steve Dickson <steved@redhat.com>
Date: Wed Jun 27 12:42:05 2018 -0400
Revert "gssd.c: Remomved a couple of warning errors"
This reverts commit 98118f5e382cdeb1acf25370768d5dfdc254ba5d.
Added back the 'm' character which cause memory to be
allocated for the string convertions.
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index 7b21ee2..2c14e5f 100644
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -279,16 +279,16 @@ gssd_read_service_info(int dirfd, struct clnt_info *clp)
* (commit bf19aacecbeebccb2c3d150a8bd9416b7dba81fe)
*/
numfields = fscanf(info,
- "RPC server: %s\n"
- "service: %s (%d) version %d\n"
- "address: %s\n"
- "protocol: %s\n"
- "port: %s\n",
- (char *)&server,
- (char *)&service, &program, &version,
- (char *)&address,
- (char *)&protoname,
- (char *)&port);
+ "RPC server: %ms\n"
+ "service: %ms (%d) version %d\n"
+ "address: %ms\n"
+ "protocol: %ms\n"
+ "port: %ms\n",
+ &server,
+ &service, &program, &version,
+ &address,
+ &protoname,
+ &port);
switch (numfields) {

View File

@ -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.2
Release: 0.rc2%{?dist}
Release: 1.rc2%{?dist}
Epoch: 1
# group all 32bit related archs
@ -16,6 +16,7 @@ Source4: lockd.conf
Source5: 24-nfs-server.conf
Patch001: nfs-utils-2.3.3-rc2.patch
Patch002: nfs-utils-2.3.2-gssd-revert.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -309,6 +310,9 @@ fi
%{_libdir}/libnfsidmap.so
%changelog
* Wed Jun 27 2018 Steve Dickson <steved@redhat.com> 2.3.2-1-rc2
- Revert: gssd.c: Remomved a couple of warning errors
* Mon Jun 25 2018 Steve Dickson <steved@redhat.com> 2.3.2-0-rc2
- Update to latest RC release: nfs-utils-2-3-3-rc2