rpms/krb5/F-12 kpropd.init,1.10,1.11 krb5.spec,1.233,1.234

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25176/F-12

Modified Files:
	kpropd.init krb5.spec 
Log Message:
- fix output of kprop's init script's "status" and "reload" commands (#588222)



Index: kpropd.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-12/kpropd.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kpropd.init	14 Jan 2010 21:28:35 -0000	1.10
+++ kpropd.init	4 May 2010 19:32:34 -0000	1.11
@@ -65,13 +65,17 @@ case "$1" in
 	stop
 	;;
   # We don't really "do" reload, so treat it as a restart.
-  restart|reload)
+  restart|force-reload)
 	stop
 	start
 	;;
+  reload)
+	echo "can't reload configuration, you have to restart it"
+	RETVAL=3
+	;;
   status)
 	status -l kprop ${kpropd}
-	retval=$?
+	RETVAL=$?
 	;;
   condrestart)
 	if [ -f /var/lock/subsys/kprop ] ; then
@@ -80,7 +84,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
 	RETVAL=2
 	;;
 esac


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-12/krb5.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- krb5.spec	20 Apr 2010 18:44:52 -0000	1.233
+++ krb5.spec	4 May 2010 19:32:34 -0000	1.234
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7.1
-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.1-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -225,6 +225,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Tue May  4 2010 Nalin Dahyabhai <nalin at redhat.com> 1.7.1-8
+- fix output of kprop's init script's "status" and "reload" commands (#588222)
+
 * Tue Apr 20 2010 Nalin Dahyabhai <nalin at redhat.com> 1.7.1-7
 - incorporate patch to fix double-free in the KDC (CVE-2010-1320, #584093)