summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-02-22 12:50:10 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-02-22 12:53:14 (GMT)
commit12214333ab4a2df8333d8fa59336dcb42f29b492 (patch)
tree4a96ff59ad232662e1dd3896f0040e9d0877aa13
parenta7bae20c70f5d4c53532fbbe4b940b8671551b81 (diff)
downloadserver-12214333ab4a2df8333d8fa59336dcb42f29b492.tar.gz
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.
-rw-r--r--kolabd/kolabd/templates/slapd.conf.template4
1 files changed, 0 insertions, 4 deletions
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