rpms/krb5/devel kadmind.init, 1.12, 1.13 kpropd.init, 1.3, 1.4 krb5.spec, 1.146, 1.147 krb524d.init, 1.6, 1.7 krb5kdc.init, 1.9, 1.10
Nalin Somabhai Dahyabhai (nalin)
fedora-extras-commits at redhat.com
Wed Jan 2 17:04:16 UTC 2008
Author: nalin
Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28949
Modified Files:
kadmind.init kpropd.init krb5.spec krb524d.init krb5kdc.init
Log Message:
- some init script cleanups
- drop unquoted check and silent exit for "$NETWORKING" (#426852, #242500)
- krb524: don't barf on missing database if it looks like we're using kldap,
same as for kadmin
- return non-zero status for missing files which cause startup to fail
Index: kadmind.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/kadmind.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kadmind.init 11 Sep 2007 19:03:15 -0000 1.12
+++ kadmind.init 2 Jan 2008 17:03:38 -0000 1.13
@@ -14,9 +14,6 @@
# Get config.
. /etc/sysconfig/network
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
# Get config.
[ -r /etc/sysconfig/kadmin ] && . /etc/sysconfig/kadmin
@@ -34,13 +31,14 @@
# then we don't know for sure that this is an error.
if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
echo $"Error. Default principal database does not exist."
- exit 0
+ exit 1
fi
fi
if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
echo $"Error. This appears to be a slave server, found kpropd.acl"
- exit 0
+ exit 6
else
+ [ -x $kadmind ] || exit 5
if [ ! -f /var/kerberos/krb5kdc/kadm5.keytab ] ; then
echo -n $"Extracting kadm5 Service Keys: "
# This should always work.
@@ -97,7 +95,7 @@
;;
*)
echo $"Usage: $0 {start|stop|status|condrestart|reload|restart}"
- RETVAL=1
+ RETVAL=2
;;
esac
Index: kpropd.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/kpropd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kpropd.init 9 Sep 2004 07:06:49 -0000 1.3
+++ kpropd.init 2 Jan 2008 17:03:38 -0000 1.4
@@ -12,9 +12,6 @@
# Get config.
. /etc/sysconfig/network
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
# Source function library.
. /etc/init.d/functions
@@ -22,11 +19,10 @@
prog="Kerberos 5 Propagation Server"
kpropd=/usr/kerberos/sbin/kpropd
-# Sheel functions to cut down on useless shell instances.
+# Shell functions to cut down on useless shell instances.
start() {
- if [ ! -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
- exit 0
- fi
+ [ -f /var/kerberos/krb5kdc/kpropd.acl ] || exit 6
+ [ -x $kpropd ] || exit 5
echo -n $"Starting $prog: "
daemon ${kpropd} -S
RETVAL=$?
@@ -65,7 +61,7 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- RETVAL=1
+ RETVAL=2
;;
esac
Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- krb5.spec 18 Dec 2007 18:34:06 -0000 1.146
+++ krb5.spec 2 Jan 2008 17:03:38 -0000 1.147
@@ -222,6 +222,13 @@
certificate.
%changelog
+* Wed Jan 2 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-4
+- some init script cleanups
+ - drop unquoted check and silent exit for "$NETWORKING" (#426852, #242500)
+ - krb524: don't barf on missing database if it looks like we're using kldap,
+ same as for kadmin
+ - return non-zero status for missing files which cause startup to fail
+
* Tue Dec 18 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-3
- allocate space for the nul-terminator in the local pathname when looking up
a file context, and properly free a previous context (Jose Plans, #426085)
Index: krb524d.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb524d.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krb524d.init 25 Feb 2005 19:20:44 -0000 1.6
+++ krb524d.init 2 Jan 2008 17:03:38 -0000 1.7
@@ -13,9 +13,6 @@
# Get config.
. /etc/sysconfig/network
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
# Get config.
[ -r /etc/sysconfig/krb524 ] && . /etc/sysconfig/krb524
@@ -29,8 +26,14 @@
# Shell functions to cut down on unnecessary shell invocations.
start() {
if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
- exit 0
+ # Make an educated guess -- if they're using kldap somewhere,
+ # then we don't know for sure that this is an error.
+ if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
+ echo $"Error. Default principal database does not exist."
+ exit 6
+ fi
fi
+ [ -x $krb524d ] || exit 5
echo -n $"Starting $prog: "
daemon ${krb524d} ${KRB524D_ARGS:--m}
RETVAL=$?
@@ -68,7 +71,7 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- RETVAL=1
+ RETVAL=2
;;
esac
Index: krb5kdc.init
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5kdc.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krb5kdc.init 22 Jan 2007 21:27:49 -0000 1.9
+++ krb5kdc.init 2 Jan 2008 17:03:38 -0000 1.10
@@ -13,9 +13,6 @@
# Get config.
. /etc/sysconfig/network
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
# Get config.
[ -r /etc/sysconfig/krb5kdc ] && . /etc/sysconfig/krb5kdc
@@ -26,8 +23,9 @@
prog="Kerberos 5 KDC"
krb5kdc=/usr/kerberos/sbin/krb5kdc
-# Sheel functions to cut down on useless shell instances.
+# Shell functions to cut down on useless shell instances.
start() {
+ [ -x $krb5kdc ] || exit 5
echo -n $"Starting $prog: "
daemon ${krb5kdc} ${KRB5REALM:+-r ${KRB5REALM}} $KRB5KDC_ARGS
RETVAL=$?
@@ -75,7 +73,7 @@
;;
*)
echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
- RETVAL=1
+ RETVAL=2
;;
esac
More information about the fedora-extras-commits
mailing list