diff --git a/ldap.init b/ldap.init index 868c5f1..937b98d 100644 --- a/ldap.init +++ b/ldap.init @@ -121,8 +121,8 @@ function configtest() { fi done # Check the configuration file. - if ! action $"Checking configuration files for $prog: " /sbin/runuser -f -m -s /bin/sh -c "$slaptest $slaptestflags" -- "$user" ; then - if /sbin/runuser -f -m -s /bin/sh -c "$slaptest -u" -- "$user" > /dev/null 2> /dev/null ; then + if ! action $"Checking configuration files for $prog: " /sbin/runuser -m -s "$slaptest" -- "$user" "$slaptestflags"; then + if /sbin/runuser -m -s "$slaptest" -- "$user" "-u" > /dev/null 2> /dev/null ; then dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' /etc/openldap/slapd.conf | awk '{print $2}'` for directory in $dirs ; do if test -r $directory/__db.001 ; then diff --git a/openldap.spec b/openldap.spec index f8f30c1..da43142 100644 --- a/openldap.spec +++ b/openldap.spec @@ -13,7 +13,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP. Name: openldap Version: %{version_23} -Release: 3.1 +Release: 4 License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz @@ -682,6 +682,9 @@ fi %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Mon Feb 13 2006 Jay Fenlason 2.3.19-4 +- Re-fix ldap.init + * Fri Feb 10 2006 Jesse Keating - 2.3.19-3.1 - bump again for double-long bug on ppc(64)