Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.25
diff -u -r1.25 kolab.globals.in
--- kolab.globals.in	24 Apr 2009 05:01:23 -0000	1.25
+++ kolab.globals.in	17 Jul 2009 22:48:29 -0000
@@ -78,6 +78,7 @@
 ldapserver_rusr : @ldapserver_rusr@
 ldapserver_grp : @ldapserver_grp@
 ldapserver_rgrp : @ldapserver_rgrp@
+ldapserver_modulepath : @ldapserver_modulepath@
 libexecdir : @libexecdir@
 WITHOPENPKG : @WITHOPENPKG@
 LDAPD : @LDAPD@
Index: dist_conf/common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.56
diff -u -r1.56 common
--- dist_conf/common	24 Apr 2009 05:01:23 -0000	1.56
+++ dist_conf/common	17 Jul 2009 22:48:29 -0000
@@ -112,6 +112,7 @@
 	-e 's=[@]ldapserverslurpd_pidfile[@]=$(ldapserverslurpd_pidfile)=g' \
 	-e 's=[@]ldapserver_statedir[@]=$(ldapserver_statedir)=g' \
 	-e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \
+	-e 's=[@]ldapserver_modulepath[@]=$(ldapserver_modulepath)=g' \
 	-e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \
 	-e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \
 	-e 's=[@]pki_grp[@]=$(pki_grp)=g' \
Index: dist_conf/debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.29
diff -u -r1.29 debian
--- dist_conf/debian	26 Apr 2009 08:57:01 -0000	1.29
+++ dist_conf/debian	17 Jul 2009 22:48:29 -0000
@@ -109,6 +109,7 @@
 ldapserver_grp=openldap
 ldapserver_rgrp=openldap
 ldapserver_rusr=openldap
+ldapserver_modulepath=/usr/lib/ldap
 
 webserver_document_root=/usr/share/kolab
 #webserver_tmpdir=
Index: dist_conf/kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.73
diff -u -r1.73 kolab
--- dist_conf/kolab	8 Jul 2009 10:26:41 -0000	1.73
+++ dist_conf/kolab	17 Jul 2009 22:48:29 -0000
@@ -125,6 +125,7 @@
 ldapserver_grp=${kolab_mgrp}
 ldapserver_rgrp=${kolab_rgrp}
 ldapserver_rusr=${kolab_musr}
+ldapserver_modulepath=false
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_tmpdir=/tmp
Index: templates/slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.26
diff -u -r1.26 slapd.conf.template.in
--- templates/slapd.conf.template.in	20 Apr 2009 16:25:47 -0000	1.26
+++ templates/slapd.conf.template.in	17 Jul 2009 22:48:30 -0000
@@ -13,6 +13,14 @@
 # this file is automatically written by the Kolab config backend and should have the 
 # file mode 0640
 
+@@@if ldapserver_modulepath@@@
+modulepath     @@@ldapserver_modulepath@@@
+moduleload     back_bdb
+moduleload     back_monitor
+moduleload     refint
+moduleload     unique
+@@@endif@@@
+
 # manual additions are lost unless made to the template in the Kolab config directory
 # the template is  @sysconfdir@/kolab/templates/slapd.conf.template
 
@@ -31,7 +39,11 @@
 # or dynamically build.  When build dynamically the module must be loaded.
 # As the slapd that comes with the openpkg version of kolab is statically
 # build it is not necessary to load the module.
+@@@if ldapserver_modulepath@@@
+moduleload syncprov
+@@@else@@@
 # moduleload syncprov
+@@@endif@@@
 @@@else@@@
 replica-pidfile	@ldapserverslurpd_pidfile@
 replogfile      @ldapserver_replogfile@
