From 060205dbf8a8cb824394819ba7647539120a1351 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Tue, 8 Sep 2009 19:08:28 +0000
Subject: [PATCH] - if the init script fails to start krb5kdc/kadmind/kpropd
 because it's     already running (according to status()), return 0 (part of
 #521772)

---
 kadmind.init | 5 +++++
 kpropd.init  | 5 +++++
 krb5.spec    | 4 ++++
 krb5kdc.init | 5 +++++
 4 files changed, 19 insertions(+)

diff --git a/kadmind.init b/kadmind.init
index 22624f5..7539a6d 100755
--- a/kadmind.init
+++ b/kadmind.init
@@ -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() {
diff --git a/kpropd.init b/kpropd.init
index 6aac67e..0791bbb 100755
--- a/kpropd.init
+++ b/kpropd.init
@@ -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() {
diff --git a/krb5.spec b/krb5.spec
index a9b24f2..514b63e 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -208,6 +208,10 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %changelog
+* 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)
+
 * Mon Aug 24 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-7
 - work around a compile problem with new openssl
 
diff --git a/krb5kdc.init b/krb5kdc.init
index 5538621..739d56b 100755
--- a/krb5kdc.init
+++ b/krb5kdc.init
@@ -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() {