Re-insert useldapserver into koha-conf.xml

This doesn't insert the large and typically unused <ldapserver> block,
just the switch with a comment pointing to C4::Auth_with_ldap.  This otherwise
was undocumented requirement, making LDAP config a bit of a shot in the dark.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index a9fb2f2..3eb801b 100644 (file)
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -307,6 +307,7 @@ Example XML stanza for LDAP configuration in KOHA_CONF.
 
  <config>
   ...
+  <useldapserver>1</useldapserver>
   <!-- LDAP SERVER (optional) -->
   <ldapserver id="ldapserver">
     <hostname>localhost</hostname>

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 3c4da9c..e627fc6 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -190,5 +190,6 @@ __PAZPAR2_TOGGLE_XML_POST__
  <logdir>__LOG_DIR__</logdir>
  <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
  <install_log>__MISC_DIR__/koha-install-log</install_log>
+ <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
 </config>
 </yazgfs>