rpms/nfs-utils/devel nfs-utils-1.1.4-sm-notify-typo.patch, NONE, 1.1 nfs-utils.spec, 1.196, 1.197

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15574

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-sm-notify-typo.patch 
Log Message:
sm-notify: always exiting without any notification.


nfs-utils-1.1.4-sm-notify-typo.patch:

--- NEW FILE nfs-utils-1.1.4-sm-notify-typo.patch ---
commit 5d8b800b8438222a55c4698c86b558b15717aa21
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Dec 6 08:31:29 2008 -0500

    sm-notify: always exiting without any notification
    
    Added curly brackets around the record_pid() check which
    stop sm-notify from exiting when a pid file does not
    exist.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 7a7ae1a..d8e2c01 100644
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -193,10 +193,11 @@ usage:		fprintf(stderr,
 	openlog("sm-notify", LOG_PID, LOG_DAEMON);
 
 	if (strcmp(_SM_BASE_PATH, BASEDIR) == 0) {
-		if (record_pid() == 0 && force == 0 && opt_update_state == 1)
+		if (record_pid() == 0 && force == 0 && opt_update_state == 1) {
 			/* already run, don't try again */
 			nsm_log(LOG_NOTICE, "Already notifying clients; Exiting!");
 			exit(0);
+		}
 	}
 
 	if (opt_srcaddr) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- nfs-utils.spec	2 Dec 2008 15:13:36 -0000	1.196
+++ nfs-utils.spec	6 Dec 2008 13:38:17 -0000	1.197
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,7 @@
 Patch103: nfs-utils-1.1.4-gssd-dnotify.patch
 Patch104: nfs-utils-1.1.4-statd-setuid.patch
 Patch105: nfs-utils-1.1.4-mount-nfs_getport.patch
+Patch106: nfs-utils-1.1.4-sm-notify-typo.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -92,6 +93,7 @@
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -255,6 +257,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Dec  6 2008 Steve Dickson <steved at redhat.com> 1.1.4-7
+- sm-notify: always exiting without any notification.
+
 * Tue Dec  2 2008 Steve Dickson <steved at redhat.com> 1.1.4-6
 - mount command: remove local getport() implementation
 - mount command: Replace clnt_ping() and getport() calls in probe_port()