e-smith-ldap/sme9/e-smith-ldap-5.4.0-use_slapd.conf.patch

diff -Nur e-smith-ldap-5.4.0/root/var/service/ldap/run e-smith-ldap-5.4.0-slapd.d/root/var/service/ldap/run
--- e-smith-ldap-5.4.0/root/var/service/ldap/run        2013-02-13 16:21:50.000000000 +0100
+++ e-smith-ldap-5.4.0-slapd.d/root/var/service/ldap/run        2013-02-21 20:06:35.372365624 +0100
@@ -33,6 +33,10 @@
 
 /sbin/e-smith/expand-template /var/lib/ldap/DB_CONFIG
 
+# Make sure we use the slapd.conf file instead of the new slapd.d
+rm -rf /etc/openldap/slapd.d
+/sbin/e-smith/expand-template /etc/openldap/slapd.conf
+
 # If the ldif dump is empty it's sme8beta: init ldap
 [ -s "$ldif" ] || rm -f /var/lib/ldap/id2entry.bdb
 
1	diff -Nur e-smith-ldap-5.4.0/root/var/service/ldap/run e-smith-ldap-5.4.0-slapd.d/root/var/service/ldap/run
2	--- e-smith-ldap-5.4.0/root/var/service/ldap/run 2013-02-13 16:21:50.000000000 +0100
3	+++ e-smith-ldap-5.4.0-slapd.d/root/var/service/ldap/run 2013-02-21 20:06:35.372365624 +0100
4	@@ -33,6 +33,10 @@
5
6	/sbin/e-smith/expand-template /var/lib/ldap/DB_CONFIG
7
8	+# Make sure we use the slapd.conf file instead of the new slapd.d
9	+rm -rf /etc/openldap/slapd.d
10	+/sbin/e-smith/expand-template /etc/openldap/slapd.conf
11	+
12	# If the ldif dump is empty it's sme8beta: init ldap
13	[ -s "$ldif" ] \|\| rm -f /var/lib/ldap/id2entry.bdb
14