rpms/krb5/devel kadmind.init, 1.16, 1.17 kpropd.init, 1.7, 1.8 krb5.spec, 1.210, 1.211 krb5kdc.init, 1.12, 1.13

[Nalin Dahyabhai]

Author: nalin

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

Modified Files:
	kadmind.init kpropd.init krb5.spec krb5kdc.init 
Log Message:
- if the init script fails to start krb5kdc/kadmind/kpropd because it's already
  running (according to status()), return 0 (part of #521772)



Index: kadmind.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kadmind.init	20 Apr 2009 20:33:32 -0000	1.16
+++ kadmind.init	8 Sep 2009 19:08:28 -0000	1.17
@@ -56,6 +56,11 @@ start() {
 	daemon ${kadmind} ${KRB5REALM:+-r ${KRB5REALM}} $KADMIND_ARGS
 	RETVAL=$?
 	echo
+	if test $RETVAL -ne 0 ; then
+	    if status ${kadmind} > /dev/null ; then
+		RETVAL=0
+	    fi
+	fi
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/kadmin
 }
 stop() {


Index: kpropd.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kpropd.init	20 Apr 2009 20:33:32 -0000	1.7
+++ kpropd.init	8 Sep 2009 19:08:28 -0000	1.8
@@ -38,6 +38,11 @@ start() {
 	daemon ${kpropd} -S
 	RETVAL=$?
 	echo
+	if test $RETVAL -ne 0 ; then
+	    if status ${kpropd} > /dev/null ; then
+		RETVAL=0
+	    fi
+	fi
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/kprop
 }
 stop() {


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- krb5.spec	24 Aug 2009 15:51:36 -0000	1.210
+++ krb5.spec	8 Sep 2009 19:08:28 -0000	1.211
@@ -208,6 +208,10 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* 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)
+
 * Mon Aug 24 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-7
 - work around a compile problem with new openssl
 


Index: krb5kdc.init
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5kdc.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- krb5kdc.init	20 Apr 2009 20:33:32 -0000	1.12
+++ krb5kdc.init	8 Sep 2009 19:08:28 -0000	1.13
@@ -41,6 +41,11 @@ start() {
 	daemon ${krb5kdc} ${KRB5REALM:+-r ${KRB5REALM}} $KRB5KDC_ARGS
 	RETVAL=$?
 	echo
+	if test $RETVAL -ne 0 ; then
+	    if status ${krb5kdc} > /dev/null ; then
+		RETVAL=0
+	    fi
+	fi
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/krb5kdc
 }
 stop() {