From ed6d9565eb754078248e88122ae2e27a795a9bd3 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Mon, 14 Sep 2009 17:18:59 +0000
Subject: - specify the location of the subsystem lock when using the status() 
    function in the kadmind and kpropd init scripts, so that we get the    
 right error when we're dead but have a lock file - requires initscripts    
 8.99 (#521772)

---
 kadmind.init | 4 ++--
 kpropd.init  | 4 ++--
 krb5.spec    | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/kadmind.init b/kadmind.init
index 7539a6d..6e248a8 100755
--- a/kadmind.init
+++ b/kadmind.init
@@ -57,7 +57,7 @@ start() {
 	RETVAL=$?
 	echo
 	if test $RETVAL -ne 0 ; then
-	    if status ${kadmind} > /dev/null ; then
+	    if status -l kadmin ${kadmind} > /dev/null ; then
 		RETVAL=0
 	    fi
 	fi
@@ -90,7 +90,7 @@ case "$1" in
 	start
 	;;
   status)
-	status ${kadmind}
+	status -l kadmin ${kadmind}
 	RETVAL=$?
 	;;
   reload)
diff --git a/kpropd.init b/kpropd.init
index 0791bbb..80b7a79 100755
--- a/kpropd.init
+++ b/kpropd.init
@@ -39,7 +39,7 @@ start() {
 	RETVAL=$?
 	echo
 	if test $RETVAL -ne 0 ; then
-	    if status ${kpropd} > /dev/null ; then
+	    if status -l kprop ${kpropd} > /dev/null ; then
 		RETVAL=0
 	    fi
 	fi
@@ -67,7 +67,7 @@ case "$1" in
 	start
 	;;
   status)
-	status ${kpropd}
+	status -l kprop ${kpropd}
 	retval=$?
 	;;
   condrestart)
diff --git a/krb5.spec b/krb5.spec
index 514b63e..672bd7a 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -130,6 +130,8 @@ Group: System Environment/Daemons
 Summary: The KDC and related programs for Kerberos 5
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info, chkconfig
+# we need 'status -l' to work, and that option was added in 8.99
+Requires: initscripts >= 8.99-1
 Requires(preun): /sbin/install-info, chkconfig, initscripts
 Requires(postun): initscripts
 # mktemp is used by krb5-send-pr
@@ -208,6 +210,11 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %changelog
+* Mon Sep 14 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-8
+- specify the location of the subsystem lock when using the status() function
+  in the kadmind and kpropd init scripts, so that we get the right error when
+  we're dead but have a lock file - requires initscripts 8.99 (#521772)
+
 * Tue Sep  8 2009 Nalin Dahyabhai <nalin@redhat.com>
 - if the init script fails to start krb5kdc/kadmind/kpropd because it's already
   running (according to status()), return 0 (part of #521772)
-- 
cgit