[autofs/f13/master] * Fri Aug 27 2010 Ian Kent <ikent at redhat.com> - 1:5.0.5-28.fc13 - fix status privilege error (bz6276

[Ian Kent]

commit cb615696b3bd30206872874cb2f214be752b70e8
Author: Ian Kent <raven at themaw.net>
Date:   Fri Aug 27 11:16:36 2010 +0800

    * Fri Aug 27 2010 Ian Kent <ikent at redhat.com> - 1:5.0.5-28.fc13
    - fix status privilege error (bz627605).

 autofs-5.0.5-fix-status-privilege-error.patch |   24 ++++++++++++++++++++++++
 autofs.spec                                   |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/autofs-5.0.5-fix-status-privilege-error.patch b/autofs-5.0.5-fix-status-privilege-error.patch
new file mode 100644
index 0000000..605a2c8
--- /dev/null
+++ b/autofs-5.0.5-fix-status-privilege-error.patch
@@ -0,0 +1,24 @@
+autofs-5.0.5 - fix status privilege error
+
+From: Ian Kent <raven at themaw.net>
+
+The recent LSB init init script change prevent normal users from using
+the status init script action. Maybe the (very poor) specification is
+wrong or I misread it, in either case this behaviour is unacceptable.
+---
+
+ redhat/autofs.init.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+
+--- autofs-5.0.5.orig/redhat/autofs.init.in
++++ autofs-5.0.5/redhat/autofs.init.in
+@@ -154,7 +154,7 @@ function reload() {
+ RETVAL=0
+ 
+ # Only the root user may change the service status
+-if [ `id -u` -ne 0 ]; then
++if [ `id -u` -ne 0 ] && [ "$1" != "status" ]; then
+ 	echo "insufficient privilege to change service status"
+ 	exit 4
+ fi
diff --git a/autofs.spec b/autofs.spec
index 3a7e78e..40e8626 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 27%{?dist}
+Release: 28%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -55,6 +55,7 @@ Patch43: autofs-5.0.5-check-each-dc-server.patch
 Patch44: autofs-5.0.5-fix-negative-cache-included-map-lookup.patch
 Patch45: autofs-5.0.5-remove-state-machine-timed-wait.patch
 Patch46: autofs-5.0.5-fix-restart.patch
+Patch47: autofs-5.0.5-fix-status-privilege-error.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Conflicts: cyrus-sasl-lib < 2.1.23-8
@@ -143,6 +144,7 @@ echo %{version}-%{release} > .version
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -195,6 +197,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Fri Aug 27 2010 Ian Kent <ikent at redhat.com> - 1:5.0.5-28.fc13
+- fix status privilege error (bz627605).
+
 * Wed Aug 18 2010 Ian Kent <ikent at redhat.com> - 1:5.0.5-27.fc13
 - fix restart not working (bz624694).