From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Tue, 31 Jan 2012 14:30:44 +0000 (+0100)
Subject: Disable openldap workarounds.
X-Git-Tag: debian/6.0.1~5
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=42a1df2cf539acf063cd35d2ff5c48c12bb17363;p=carnet-upgrade.git

Disable openldap workarounds.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index b1bb65c..e1f31f5 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -29,7 +29,7 @@ true				restore_configs
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
 pkg freeradius-aai		upgrade_freeradius
-pkg openldap-aai		upgrade_openldap
+pkg openldap-aai		pkgadd openldap-aai
 pkg amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
diff --git a/src/functions.sh b/src/functions.sh
index acc4dad..a223c8a 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -900,19 +900,6 @@ upgrade_freeradius () {
   pkgadd freeradius-aai
 }
 
-# handle openldap upgrade
-upgrade_openldap () {
-  # aai discovers database type from debconf
-  if [ -f /etc/ldap/slapd.conf ] && grep -q ^database.*bdb /etc/ldap/slapd.conf
-  then
-     echo set slapd/backend BDB | debconf-communicate >/dev/null
-  fi
-
-  # aai does not depend on the new openldap version
-  pkgadd slapd
-  pkgadd openldap-aai
-}
-
 # handle mysql 5.0 to 5.1 upgrade
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.0; then