rpms/krb5/devel kadmind.init, 1.17, 1.18 kpropd.init, 1.8, 1.9 krb5.spec, 1.211, 1.212

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19646

Modified Files:
	kadmind.init kpropd.init krb5.spec 
Log Message:
- 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)



Index: kadmind.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kadmind.init	8 Sep 2009 19:08:28 -0000	1.17
+++ kadmind.init	14 Sep 2009 17:18:59 -0000	1.18
@@ -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)


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kpropd.init	8 Sep 2009 19:08:28 -0000	1.8
+++ kpropd.init	14 Sep 2009 17:18:59 -0000	1.9
@@ -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)


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- krb5.spec	8 Sep 2009 19:08:28 -0000	1.211
+++ krb5.spec	14 Sep 2009 17:18:59 -0000	1.212
@@ -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
 certificate.
 
 %changelog
+* Mon Sep 14 2009 Nalin Dahyabhai <nalin at 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 at 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)