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

fixed upgrade with empty database

Browse Source 
fixed /etc/sysconfig/ldap handling
This commit is contained in:
Jan Šafránek 2007-09-18 10:41:07 +00:00
parent ba2e4625b7
commit 05dc6ea44e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ldap.init
View File

@ -154,7 +154,7 @@ function start() {
user=ldap user=ldap
prog=`basename ${slapd}` prog=`basename ${slapd}`
harg="" harg=""
if test x$LDAPD_LDAP = xyes ; then if test x$SLAPD_LDAP = xyes ; then
harg="ldap:///" harg="ldap:///"
fi fi
if test x$SLAPD_LDAPS = xyes ; then if test x$SLAPD_LDAPS = xyes ; then

10
ldap.sysconfig
View File

@ -1,18 +1,20 @@
# options of slapd (see man slapd) # Options of slapd (see man slapd)
#SLAPD_OPTIONS= #SLAPD_OPTIONS=
# options of slurpd (see man slurpd) # options of slurpd (see man slurpd)
# #
#SLURPD_OPTIONS= #SLURPD_OPTIONS=
# run slapd with -h "... ldap:/// ..." # At least one of SLAPD_LDAP, SLAPD_LDAPI and SLAPD_LDAPS must be set to 'yes'!
#
# Run slapd with -h "... ldap:/// ..."
# yes/no, default: yes # yes/no, default: yes
#SLAPD_LDAP=yes #SLAPD_LDAP=yes
# run slapd with -h "... ldapi:/// ..." # Run slapd with -h "... ldapi:/// ..."
# yes/no, default: no # yes/no, default: no
#SLAPD_LDAPI=no #SLAPD_LDAPI=no
# run slapd with -h "... ldaps:/// ..." # Run slapd with -h "... ldaps:/// ..."
# yes/no, default: no # yes/no, default: no
#SLAPD_LDAPS=no #SLAPD_LDAPS=no

5
openldap.spec
View File

@ -513,7 +513,7 @@ fi
files=$(echo /var/lib/ldap/{log.*,__db.*,[a]lock}) files=$(echo /var/lib/ldap/{log.*,__db.*,[a]lock})
if [ "$files" != '/var/lib/ldap/log.* /var/lib/ldap/__db.* /var/lib/ldap/[a]lock' ] ; then if [ "$files" != '/var/lib/ldap/log.* /var/lib/ldap/__db.* /var/lib/ldap/[a]lock' ] ; then
if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
if [ -s /var/lib/ldap/upgrade.ldif ] ; then if [ -f /var/lib/ldap/upgrade.ldif ] ; then
/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || : /bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
mkdir /var/lib/ldap/rpmorig mkdir /var/lib/ldap/rpmorig
mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || : mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
@ -529,7 +529,7 @@ fi
/sbin/chkconfig --add ldap /sbin/chkconfig --add ldap
# If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it. # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
# It was created by the uninstall of the previous version. # It was created by the uninstall of the previous version.
if [ -s /var/lib/ldap/upgrade.ldif ] ; then if [ -f /var/lib/ldap/upgrade.ldif ] ; then
/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 /sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1
rm /var/lib/ldap/upgrade.ldif rm /var/lib/ldap/upgrade.ldif
fi fi
@ -680,6 +680,7 @@ fi
- skeleton /etc/sysconfig/ldap added - skeleton /etc/sysconfig/ldap added
- new SLAPD_LDAP option to turn off listening on ldap:/// (#292591) - new SLAPD_LDAP option to turn off listening on ldap:/// (#292591)
- fixed checking of SSL (#292611) - fixed checking of SSL (#292611)
- fixed upgrade with empty database
* Thu Sep 6 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-1%{?dist} * Thu Sep 6 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-1%{?dist}
- new upstream version - new upstream version