forked from rpms/rpcbind
Fixed NULL fp problem remove error message on warmstart patch
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
f915d5ad72
commit
aad80f7260
31
rpcbind-0.2.2-warmstart.patch
Normal file
31
rpcbind-0.2.2-warmstart.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
commit 52fbdcba91df95ef342949a958f00bc0470f5777
|
||||||
|
Author: Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
Date: Wed Dec 17 10:25:33 2014 -0500
|
||||||
|
|
||||||
|
rpcbind: remove error message on warmstart
|
||||||
|
|
||||||
|
Don't print an error message on warmstart if the
|
||||||
|
startup files don't exist (take two)
|
||||||
|
|
||||||
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||||
|
|
||||||
|
diff --git a/src/warmstart.c b/src/warmstart.c
|
||||||
|
index 85ecf96..b6eb73e 100644
|
||||||
|
--- a/src/warmstart.c
|
||||||
|
+++ b/src/warmstart.c
|
||||||
|
@@ -105,10 +105,11 @@ read_struct(char *filename, xdrproc_t structproc, void *list)
|
||||||
|
if (debugging)
|
||||||
|
fprintf(stderr, "rpcbind: using '%s' startup file\n", filename);
|
||||||
|
|
||||||
|
- if (((fp = fopen(filename, "r")) == NULL) && errno != ENOENT) {
|
||||||
|
- syslog(LOG_ERR,
|
||||||
|
- "Cannot open '%s' file for reading, errno %d (%s)",
|
||||||
|
- filename, errno, strerror(errno));
|
||||||
|
+ if ((fp = fopen(filename, "r")) == NULL) {
|
||||||
|
+ if (errno != ENOENT)
|
||||||
|
+ syslog(LOG_ERR,
|
||||||
|
+ "Cannot open '%s' file for reading, errno %d (%s)",
|
||||||
|
+ filename, errno, strerror(errno));
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: rpcbind
|
Name: rpcbind
|
||||||
Version: 0.2.2
|
Version: 0.2.2
|
||||||
Release: 1.0%{?dist}
|
Release: 1.1%{?dist}
|
||||||
Summary: Universal Addresses to RPC Program Number Mapper
|
Summary: Universal Addresses to RPC Program Number Mapper
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -13,6 +13,7 @@ Source2: rpcbind.socket
|
|||||||
Source3: rpcbind.sysconfig
|
Source3: rpcbind.sysconfig
|
||||||
|
|
||||||
Patch001: rpcbind-0.2.3-rc1.patch
|
Patch001: rpcbind-0.2.3-rc1.patch
|
||||||
|
Patch002: rpcbind-0.2.2-warmstart.patch
|
||||||
|
|
||||||
Requires: glibc-common setup
|
Requires: glibc-common setup
|
||||||
Conflicts: man-pages < 2.43-12
|
Conflicts: man-pages < 2.43-12
|
||||||
@ -35,6 +36,7 @@ RPC calls on a server on that machine.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch001 -p1
|
%patch001 -p1
|
||||||
|
%patch002 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
@ -126,6 +128,9 @@ fi
|
|||||||
%dir %attr(700,rpc,rpc) /var/lib/rpcbind
|
%dir %attr(700,rpc,rpc) /var/lib/rpcbind
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 17 2014 Steve Dickson <steved@redhat.com> - 0.2.2-1.1
|
||||||
|
- Fixed NULL fp problem remove error message on warmstart patch
|
||||||
|
|
||||||
* Tue Dec 16 2014 Steve Dickson <steved@redhat.com> - 0.2.2-1.0
|
* Tue Dec 16 2014 Steve Dickson <steved@redhat.com> - 0.2.2-1.0
|
||||||
- Updated to the latest rc release: rpcbind-0_2_3-rc1
|
- Updated to the latest rc release: rpcbind-0_2_3-rc1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user