initscript: fix possible infinite loop

Resolves: #641946
This commit is contained in:
Jan Vcelak 2010-11-01 13:17:50 +01:00
parent 54ef52388e
commit b7ea9f6802
2 changed files with 10 additions and 10 deletions

View File

@ -150,17 +150,16 @@ function configtest() {
fi fi
# Unaccessible TLS configuration files. # Unaccessible TLS configuration files.
if [ -d $configdir ]; then if [ -d $configdir ]; then
tlsconfigs=`LANG=C awk '/^olcTLS/ { tlsconfigs=$(LANG=C sed \
while (/^olcTLS/) { -e '/^olcTLS\(CertificateFile\|CertificateKeyFile\|CACertificateFile\)/!d' \
if (/^olc(TLSCertificateKeyFile|TLSCertificateFile|TLSCACertificateFile)[ \t]*:[\t]*/) { -e ':a;N;s/\n //;ta;P;D' "${configdir}/cn=config.ldif" | \
do { printf gensub(/^ /,"",1); getline } while (/^ /) awk '{print $2}' | sort -u
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}' | sort -u
)
fi fi
for file in $tlsconfigs ; do for file in $tlsconfigs ; do
if ! testasuser $user -r $file ; then if ! testasuser $user -r $file ; then

View File

@ -644,6 +644,7 @@ exit 0
%changelog %changelog
* Mon Nov 01 2010 Jan Vcelak <jvcelak@redhat.com> 2.4.23-2 * Mon Nov 01 2010 Jan Vcelak <jvcelak@redhat.com> 2.4.23-2
- fix possible infinite loop when checking permissions of TLS files (#641946)
- removed outdated autofs.schema (#643045) - removed outdated autofs.schema (#643045)
- removed outdated README.upgrade - removed outdated README.upgrade
- removed relics of migrationtools - removed relics of migrationtools