packages: openldap/ldap.init - fix startup with RC_LOGGING=no (don't assume...
glen
glen at pld-linux.org
Thu Sep 3 13:16:45 CEST 2009
Author: glen Date: Thu Sep 3 11:16:45 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix startup with RC_LOGGING=no (don't assume shell syntax on args)
---- Files affected:
packages/openldap:
ldap.init (1.30 -> 1.31)
---- Diffs:
================================================================
Index: packages/openldap/ldap.init
diff -u packages/openldap/ldap.init:1.30 packages/openldap/ldap.init:1.31
--- packages/openldap/ldap.init:1.30 Fri May 1 01:24:42 2009
+++ packages/openldap/ldap.init Thu Sep 3 13:16:40 2009
@@ -41,14 +41,14 @@
if [ -n "$SLAPDSYSLOGLEVEL" ]; then
ARGS="$ARGS -s $SLAPDSYSLOGLEVEL"
fi
- if [ -n "$SLAPDURLLIST" ]; then
- ARGS="$ARGS -h \"$SLAPDURLLIST\""
- fi
if [ -n "$SLAPDOPTIONS" ]; then
ARGS="$ARGS $SLAPDOPTIONS"
fi
- SERVICE_RUN_NICE_LEVEL="$SLAPDNICE"
- daemon /usr/sbin/slapd $ARGS
+ # optionally support old option
+ if [ -n "$SLAPDNICE" ]; then
+ SERVICE_RUN_NICE_LEVEL=$SLAPDNICE
+ fi
+ daemon /usr/sbin/slapd $ARGS ${SLAPDURLLIST:+ -h "$SLAPDURLLIST"}
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap
if [ $RETVAL -eq 0 -a -S /var/run/ldapi ]; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/ldap.init?r1=1.30&r2=1.31&f=u
More information about the pld-cvs-commit
mailing list