rpms/openldap
6
0
Fork 0
Code Issues Pull Requests Releases Activity

minor corrections of init script (#571235, #570057, #573804)

Browse Source
This commit is contained in:
Jan Zeleny 2010-03-16 14:47:34 +00:00
parent 9afd56665a
commit eae98e4691
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ldap.init
View File

@ -113,7 +113,7 @@ function configtest() {
slaptestflags="" slaptestflags=""
dbdirs="" dbdirs=""
if [ -d $configdir ]; then if [ -d $configdir ]; then
for configfile in `ls -1 $configdir/cn\=config/olcDatabase*`; do for configfile in `ls -1 $configdir/cn\=config/olcDatabase*.ldif`; do
dbdirs=$dbdirs" dbdirs=$dbdirs"
"`LANG=C egrep '^olcDbDirectory[[:space:]]*:[[:space:]]+[[:print:]]+$' $configfile | sed 's,^olcDbDirectory: ,,'` "`LANG=C egrep '^olcDbDirectory[[:space:]]*:[[:space:]]+[[:print:]]+$' $configfile | sed 's,^olcDbDirectory: ,,'`
done done
@ -144,7 +144,15 @@ function configtest() {
fi fi
# Unaccessible TLS configuration files. # Unaccessible TLS configuration files.
if [ -d $configdir ]; then if [ -d $configdir ]; then
tlsconfigs=`LANG=C egrep '^olc(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]*:[[:space:]]' $configdir/cn\=config.ldif | awk '{print $2}'` tlsconfigs=`LANG=C awk '/^olcTLS/ {
while (/^olcTLS/) {
if (/^olc(TLSCertificateKeyFile|TLSCertificateFile|TLSCACertificateFile)[ \t]*:[\t]*/) {
do { printf gensub(/^ /,"",1); getline } while (/^ /)
printf "\n" ;
}
else break;
}
}' $configdir/cn\=config.ldif | awk '{print $2}'`
elif [ -f $configfile ]; then elif [ -f $configfile ]; then
tlsconfigs=`LANG=C egrep '^(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]+' $configfile | awk '{print $2}'` tlsconfigs=`LANG=C egrep '^(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]+' $configfile | awk '{print $2}'`
fi fi
@ -243,7 +251,6 @@ case "$1" in
RETVAL=$? RETVAL=$?
;; ;;
restart|force-reload) restart|force-reload)
status -p $pidfile ${slapd} > /dev/null 2>&1 || exit 7
stop stop
start start
RETVAL=$? RETVAL=$?

5
openldap.spec
View File

@ -11,7 +11,7 @@
Summary: LDAP support libraries Summary: LDAP support libraries
Name: openldap Name: openldap
Version: %{version} Version: %{version}
Release: 4%{?dist} Release: 5%{?dist}
License: OpenLDAP License: OpenLDAP
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@ -631,6 +631,9 @@ fi
%attr(0644,root,root) %{evolution_connector_libdir}/*.a %attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog %changelog
* Tue Mar 16 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-5
- minor corrections of init script (#571235, #570057, #573804)
* Wed Feb 24 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-4 * Wed Feb 24 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-4
- fixed SIGSEGV when deleting data using hdb (#562227) - fixed SIGSEGV when deleting data using hdb (#562227)