From b67cdcdcd75e53cf94d9764d25e7d09ecfa9c1d2 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Fri, 14 Sep 2007 19:09:03 +0000
Subject: [PATCH] - Changed the default paths in sm-notify to
 /var/lib/nfs/statd (bz 258461)

---
 nfs-utils-1.1.0-smnotify-path.patch | 70 +++++++++++++++++++++++++++++
 nfs-utils.spec                      | 10 ++++-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 nfs-utils-1.1.0-smnotify-path.patch

diff --git a/nfs-utils-1.1.0-smnotify-path.patch b/nfs-utils-1.1.0-smnotify-path.patch
new file mode 100644
index 0000000..c5ca70f
--- /dev/null
+++ b/nfs-utils-1.1.0-smnotify-path.patch
@@ -0,0 +1,70 @@
+commit 02968aa55972b680fa00273188da281d7612ca3e
+Author: Steve Dickson <steved@redhat.com>
+Date:   Fri Sep 14 14:19:50 2007 -0400
+
+    Changed the default paths in sm-notify to
+    /var/lib/nfs/statd which is where the locking
+    state is kept in Red Hat distros.
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
+index 98c03f9..862889f 100644
+--- a/utils/statd/sm-notify.c
++++ b/utils/statd/sm-notify.c
+@@ -24,11 +24,13 @@
+ #include <errno.h>
+ #include <grp.h>
+ 
++#define STATD_PATH_XTN "statd/"
++
+ #ifndef BASEDIR
+ # ifdef NFS_STATEDIR
+-#  define BASEDIR		NFS_STATEDIR
++#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
+ # else
+-#  define BASEDIR		"/var/lib/nfs"
++#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
+ # endif
+ #endif
+ 
+diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man
+index dd03b8d..69b7059 100644
+--- a/utils/statd/sm-notify.man
++++ b/utils/statd/sm-notify.man
+@@ -33,7 +33,7 @@ but this is configurable.
+ For each NFS client or server machine to be monitored,
+ .B rpc.statd
+ creates a file in
+-.BR /var/lib/nfs/sm ", "
++.BR /var/lib/nfs/statd/sm ", "
+ and removes the file if monitoring is no longer required.
+ .PP
+ When the machine is rebooted,
+@@ -47,7 +47,7 @@ Each machine has an
+ which is basically an integer counter that is incremented
+ each time the machine reboots. This counter is stored
+ in
+-.BR /var/lib/nfs/state ,
++.BR /var/lib/nfs/statd/state ,
+ and updated by
+ .BR sm-notify .
+ .SS Security
+@@ -149,13 +149,13 @@ By default,
+ .B sm-notify
+ forks and puts itself in the background after obtaining the
+ list of hosts from
+-.BR /var/lib/nfs/sm .
++.BR /var/lib/nfs/statd/sm .
+ .SH FILES
+-.BR /var/lib/nfs/state
++.BR /var/lib/nfs/statd/state
+ .br
+-.BR /var/lib/nfs/sm/*
++.BR /var/lib/nfs/statd/sm/*
+ .br
+-.BR /var/lib/nfs/sm.bak/*
++.BR /var/lib/nfs/statd/sm.bak/*
+ .br
+ .BR /var/run/sm-notify.pid
+ .SH SEE ALSO
diff --git a/nfs-utils.spec b/nfs-utils.spec
index a67468d..7b96cd8 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.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -33,6 +33,7 @@ Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 Patch10: nfs-utils-1.1.0-exportfs-open.patch
+Patch11: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -65,7 +66,7 @@ Requires: modutils >= 2.4.26-9
 BuildRequires: libgssapi-devel >= 0.11 libevent-devel >= 1.3b
 BuildRequires: nfs-utils-lib-devel >= 1.1.0
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: automake, libtool
+BuildRequires: automake, libtool, glibc-headers
 BuildRequires: e2fsprogs-devel, krb5-devel, tcp_wrappers-devel
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
@@ -96,6 +97,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -266,6 +268,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved@redhat.com>  1.1.0-5
+- Changed the default paths in sm-notify to 
+  /var/lib/nfs/statd (bz 258461)
+
 * Wed Aug 15 2007 Steve Dickson <steved@redhat.com>  1.1.0-4
 - Make sure the open() system calling in exportfs uses
   mode bits when creating the etab file (bz 252440).