Accepting request 265025 from home:jeff_mahoney:branches:network

- 0002-rpcinfo_warmstart-no_warning_about_missing_file.patch: fix
  merge issue causing segfaults on missing file (bnc#909619).

OBS-URL: https://build.opensuse.org/request/show/265025
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=52

0002-rpcinfo_warmstart-no_warning_about_missing_file.patch

@@ -1,25 +1,26 @@
+From: Thorsten Kukuk <kukuk@suse.com>
+Subject: rpcinfo: warmstart - no warning about missing file
 
 Don't print an error message on warmstart if the
 startup files don't exist.
 
-Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
+---
+ src/warmstart.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 --- a/src/warmstart.c
-+++ b/src/warmstart.c	2014/12/10 15:04:42
++++ b/src/warmstart.c
-@@ -101,13 +101,13 @@
+@@ -106,9 +106,10 @@ read_struct(char *filename, xdrproc_t st
- {
- 	FILE *fp;
- 	XDR xdrs;
--	 
-+
- 	if (debugging)
  		fprintf(stderr, "rpcbind: using '%s' startup file\n", filename);
  
--	if ((fp = fopen(filename, "r")) == NULL) {
+ 	if ((fp = fopen(filename, "r")) == NULL) {
-+	if (((fp = fopen(filename, "r")) == NULL) && errno != ENOENT) {
+-		syslog(LOG_ERR,
- 		syslog(LOG_ERR,
 -			"Cannot open '%s' file for reading, errno %d (%s)", 
+-			filename, errno, strerror(errno));
++                if (errno != ENOENT)
++			syslog(LOG_ERR,
 +			   "Cannot open '%s' file for reading, errno %d (%s)",
- 			filename, errno, strerror(errno));
++			   filename, errno, strerror(errno));
  		goto error;
  	}
+ 

rpcbind.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 12 17:01:44 UTC 2014 - jeffm@suse.com
+
+- 0002-rpcinfo_warmstart-no_warning_about_missing_file.patch: fix
+  merge issue causing segfaults on missing file (bnc#909619).
+
 -------------------------------------------------------------------
 Thu Dec 11 13:07:09 CET 2014 - kukuk@suse.de