diff options
| author | Nalin Dahyabhai <nalin@fedoraproject.org> | 2009-09-08 19:08:28 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@fedoraproject.org> | 2009-09-08 19:08:28 +0000 |
| commit | 060205dbf8a8cb824394819ba7647539120a1351 (patch) | |
| tree | 5db18510cc1f2345b5a7ce29e9b096c2333daf37 | |
| parent | 51ff876d52dc4a3fbd8e213bc8e89f0ed58c90c9 (diff) | |
| download | krb5-060205dbf8a8cb824394819ba7647539120a1351.tar.gz krb5-060205dbf8a8cb824394819ba7647539120a1351.tar.xz krb5-060205dbf8a8cb824394819ba7647539120a1351.zip | |
- if the init script fails to start krb5kdc/kadmind/kpropd because it's
already running (according to status()), return 0 (part of #521772)
| -rwxr-xr-x | kadmind.init | 5 | ||||
| -rwxr-xr-x | kpropd.init | 5 | ||||
| -rw-r--r-- | krb5.spec | 4 | ||||
| -rwxr-xr-x | krb5kdc.init | 5 |
4 files changed, 19 insertions, 0 deletions
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() { @@ -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() { |