diff options
| author | Nalin Dahyabhai <nalin@fedoraproject.org> | 2009-09-14 17:18:59 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@fedoraproject.org> | 2009-09-14 17:18:59 +0000 |
| commit | d2ad657773f37625ba46ac96e1442e9d7ef6cc20 (patch) | |
| tree | 67494e28bc0d7262db9fb29ae6c9c0ebe38ca356 | |
| parent | 060205dbf8a8cb824394819ba7647539120a1351 (diff) | |
| download | krb5-d2ad657773f37625ba46ac96e1442e9d7ef6cc20.tar.gz krb5-d2ad657773f37625ba46ac96e1442e9d7ef6cc20.tar.xz krb5-d2ad657773f37625ba46ac96e1442e9d7ef6cc20.zip | |
- specify the location of the subsystem lock when using the status()krb5-1_7-8_fc12F-12-split
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)
| -rwxr-xr-x | kadmind.init | 4 | ||||
| -rwxr-xr-x | kpropd.init | 4 | ||||
| -rw-r--r-- | krb5.spec | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/kadmind.init b/kadmind.init index 7539a6d..6e248a8 100755 --- a/kadmind.init +++ b/kadmind.init @@ -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) diff --git a/kpropd.init b/kpropd.init index 0791bbb..80b7a79 100755 --- a/kpropd.init +++ b/kpropd.init @@ -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) @@ -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 using a private key and a certificate. %changelog +* Mon Sep 14 2009 Nalin Dahyabhai <nalin@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@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) |