From 6a83824435e355976e866b21a6316799acb53254 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Sat, 6 Dec 2008 13:38:17 +0000
Subject: [PATCH] sm-notify: always exiting without any notification.

---
 nfs-utils-1.1.4-sm-notify-typo.patch | 29 ++++++++++++++++++++++++++++
 nfs-utils.spec                       |  7 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 nfs-utils-1.1.4-sm-notify-typo.patch

diff --git a/nfs-utils-1.1.4-sm-notify-typo.patch b/nfs-utils-1.1.4-sm-notify-typo.patch
new file mode 100644
index 0000000..213faae
--- /dev/null
+++ b/nfs-utils-1.1.4-sm-notify-typo.patch
@@ -0,0 +1,29 @@
+commit 5d8b800b8438222a55c4698c86b558b15717aa21
+Author: Steve Dickson <steved@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@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) {
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 0aa7018..7a0f6a9 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 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 @@ Patch102: nfs-utils-1.1.4-showmount-rpcbind.patch
 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 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -255,6 +257,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Dec  6 2008 Steve Dickson <steved@redhat.com> 1.1.4-7
+- sm-notify: always exiting without any notification.
+
 * Tue Dec  2 2008 Steve Dickson <steved@redhat.com> 1.1.4-6
 - mount command: remove local getport() implementation
 - mount command: Replace clnt_ping() and getport() calls in probe_port()