Branch '2.3-stable' - kolabd/kolabd
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Tue Feb 22 13:54:18 CET 2011
kolabd/kolabd/templates/slapd.conf.template | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 1307e1f7c5c334705f1ad0af1b1484a3f2a96d44
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Feb 22 12:50:10 2011 +0000
perl-Kolab does not handle nested if/else/endif very well, either causing the template to be terminated at 'moduleload' or to incorrectly include the TLS configuration during bootstrap.
Fixes issue4708, bug #49.
diff --git a/kolabd/kolabd/templates/slapd.conf.template b/kolabd/kolabd/templates/slapd.conf.template
index 075028a..82a2395 100644
--- a/kolabd/kolabd/templates/slapd.conf.template
+++ b/kolabd/kolabd/templates/slapd.conf.template
@@ -52,12 +52,8 @@ argsfile @@@ldapserver_argsfile@@@
# 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@@@
replicationinterval 5
More information about the commits
mailing list