From 1ae9d4b65decf49a5800b60060595692d996f0f9 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:25:52 +0000
Subject: [PATCH] auto-import changelog data from nfs-utils-1.0.6-29.src.rpm
 Wed Jun 16 2004 <SteveD@RedHat.com> - nfslock stop is now done on package
 removals - Eliminate 4 syslog messages that are logged for successful events.

---
 nfs-utils-1.0.6-mountd.patch | 63 ++++++++++++++++++++++++++++++++++++
 nfs-utils.spec               |  9 +++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/nfs-utils-1.0.6-mountd.patch b/nfs-utils-1.0.6-mountd.patch
index 2c9950e..c649709 100644
--- a/nfs-utils-1.0.6-mountd.patch
+++ b/nfs-utils-1.0.6-mountd.patch
@@ -27,5 +27,68 @@
 +	}
 +	return 1;
  }	
+
+
+#
+# Eliminate 4 syslog message that are logged for
+# successful events.
+#
+--- src/utils/mountd/mountd.c.org	2003-09-12 18:14:16.000000000 -0400
++++ src/utils/mountd/mountd.c	2004-06-16 09:31:06.000000000 -0400
+@@ -90,10 +90,11 @@ mount_dump_1_svc(struct svc_req *rqstp, 
+ {
+ 	struct sockaddr_in *addr =
+ 		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
+-	xlog(L_NOTICE, "dump request from %s",
+-		inet_ntoa(addr->sin_addr));
  
+-	*res = mountlist_list();
++	if ((*res = mountlist_list()) == NULL)
++		xlog(L_WARNING, "dump request from %s failed.",
++			inet_ntoa(addr->sin_addr));
++
+ 	return 1;
+ }
  
+@@ -143,9 +144,11 @@ mount_export_1_svc(struct svc_req *rqstp
+ {
+ 	struct sockaddr_in *addr =
+ 		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
+-	xlog(L_NOTICE, "export request from %s",
+-		inet_ntoa(addr->sin_addr));
+-	*resp = get_exportlist();
++
++	if ((*resp = get_exportlist()) == NULL)
++		xlog(L_WARNING, "export request from %s failed.",
++			inet_ntoa(addr->sin_addr));
++		
+ 	return 1;
+ }
+ 
+@@ -154,9 +157,10 @@ mount_exportall_1_svc(struct svc_req *rq
+ {
+ 	struct sockaddr_in *addr =
+ 		(struct sockaddr_in *) svc_getcaller(rqstp->rq_xprt);
+-	xlog(L_NOTICE, "exportall request from %s",
+-		inet_ntoa(addr->sin_addr));
+-	*resp = get_exportlist();
++
++	if ((*resp = get_exportlist()) == NULL)
++		xlog(L_WARNING, "exportall request from %s failed.",
++			inet_ntoa(addr->sin_addr));
+ 	return 1;
+ }
+ 
+--- src/utils/mountd/auth.c.org	2004-06-16 08:54:32.000000000 -0400
++++ src/utils/mountd/auth.c	2004-06-16 08:55:15.000000000 -0400
+@@ -194,9 +194,8 @@ auth_authenticate(char *what, struct soc
+ 		break;
+ 
+ 	case success:
+-		xlog(L_NOTICE, "authenticated %s request from %s:%d for %s (%s)",
+-		     what, hp->h_name, ntohs(caller->sin_port), path, epath);
+ 		break;
++
+ 	default:
+ 		xlog(L_NOTICE, "%s request from %s:%d for %s (%s) gave %d",
+ 		     what, hp->h_name, ntohs(caller->sin_port), path, epath, error);
diff --git a/nfs-utils.spec b/nfs-utils.spec
index d3e0993..0a468ac 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -15,7 +15,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.6
-%define release 27
+%define release 29
 
 %define Release %{release}
 %if %{rhel3build}
@@ -39,6 +39,7 @@ Patch4: nfs-utils-1.0.3-aclexport.patch
 Patch5: nfs-utils-1.0.6-zerostats.patch
 Patch6: nfs-utils-1.0.6-mountd.patch
 Patch7: nfs-utils-1.0.6-expwarn.patch
+
 %if %{nfsv4_support}
 Patch20: nfs-utils-nfsv4-pseudoflavor-clients.patch
 Patch21: nfs-utils-nfsv4-mountd_flavors.patch
@@ -194,6 +195,7 @@ fi
 %preun
 if [ "$1" = "0" ]; then
     /etc/rc.d/init.d/nfs stop
+    /etc/rc.d/init.d/nfslock stop
     /sbin/chkconfig --del nfs
     /sbin/chkconfig --del nfslock
     /usr/sbin/userdel rpcuser 2>/dev/null || :
@@ -256,6 +258,11 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Wed Jun 16 2004 <SteveD@RedHat.com>
+- nfslock stop is now done on package removals
+- Eliminate 4 syslog messages that are logged for
+  successful events.
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt