s4:provision Make OpenLDAP backend more robust

With the extra moduleload lines (which succeed if it's already
staticly linked), we now work with OpenLDAP overlays as modules.

Andrew Bartlett

diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf
index b0e151ba327e6af719b97c48cdf279166172bcdd..c592b6e7570dcb9a1de123388a8c3b464f917a39 100644 (file)
--- a/source4/setup/slapd.conf
+++ b/source4/setup/slapd.conf
@@ -48,12 +48,20 @@ defaultsearchbase ${DOMAINDN}
 
 rootdn cn=Manager
 
+moduleload rdnval
+
+moduleload deref
 overlay deref
 
+moduleload refint
 ${REFINT_CONFIG}
 
+moduleload memberof
 ${MEMBEROF_CONFIG}
 
+moduleload syncprov
+moduleload hdb
+
 database       ldif
 suffix         cn=Samba
 directory       ${LDAPDIR}/db/samba
@@ -87,8 +95,8 @@ ${INDEX_CONFIG}
 overlay syncprov
 syncprov-sessionlog 100
 syncprov-checkpoint 100 10
-overlay rdnval
 
+overlay rdnval
 
 ### Multimaster-Replication of cn=schema Subcontext ###
 ${MMR_SYNCREPL_SCHEMA_CONFIG}
@@ -108,6 +116,7 @@ ${INDEX_CONFIG}
 overlay syncprov
 syncprov-sessionlog 100
 syncprov-checkpoint 100 10
+
 overlay rdnval
 
 ### Multimaster-Replication of cn=config Subcontext ###
@@ -128,6 +137,7 @@ ${INDEX_CONFIG}
 overlay syncprov
 syncprov-sessionlog 100
 syncprov-checkpoint 100 10
+
 overlay rdnval
 
 ### Multimaster-Replication of cn=user/base-dn context ###