rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

nfsdcltrack: Fix printf format (bz 1995316)

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
Resolves: bz1995316
This commit is contained in:
Steve Dickson 2021-08-20 14:26:59 -04:00
parent f292720814
commit b37bd70962
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nfs-utils-2.5.4-nfsdcltrack-printf.patch Normal file
View File

@ -0,0 +1,42 @@
diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
index 2f8bea81..7c1c4bcc 100644
--- a/utils/nfsdcltrack/nfsdcltrack.c
+++ b/utils/nfsdcltrack/nfsdcltrack.c
@@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <unistd.h>
#include <libgen.h>
#include <sys/inotify.h>
@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr)
if (*tail)
return -EINVAL;
- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime);
ret = sqlite_remove_unreclaimed(gracetime);
diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
index b6573544..78c22af8 100644
--- a/utils/nfsdcltrack/sqlite.c
+++ b/utils/nfsdcltrack/sqlite.c
@@ -46,6 +46,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <unistd.h>
#include <sqlite3.h>
#include <stdint.h>
@@ -545,7 +546,7 @@ sqlite_remove_unreclaimed(uint64_t grace_start)
int ret;
char *err = NULL;
- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64,
grace_start);
if (ret < 0) {
return ret;

4
nfs-utils.spec
View File

@ -18,6 +18,7 @@ Source4: 10-nfsv4.conf
# RHEL9.0
#
Patch001: nfs-utils-2.5.4-mount-sloppy.patch
Patch002: nfs-utils-2.5.4-nfsdcltrack-printf.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -441,9 +442,10 @@ fi
%{_mandir}/*/nfsiostat.8.gz
%changelog
* Wed Aug 18 2021 Steve Dickson <steved@redhat.com> 2.5.4-3
* Fri Aug 20 2021 Steve Dickson <steved@redhat.com> 2.5.4-3
- mount.nfs: insert 'sloppy' at beginning of the options (bz 1987070)
- spec: Fix dependency problems with nfsdclnts (bz 1924708)
- nfsdcltrack: Fix printf format (bz 1995316)
* Mon Aug 16 2021 Steve Dickson <steved@redhat.com> 2.5.4-2
- Remove nfsconvert command (bz 1937811)