Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/other/openldap.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -7,8 +7,8 @@
   <!ENTITY openldap-download-http " ">
   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "47c8e2f283647a6105b8b0325257e922">
+  <!ENTITY openldap-md5sum        "49ca65e27891fcf977d78c10f073c705">
   <!ENTITY openldap-size          "5.4 MB">
-  <!ENTITY openldap-buildsize     "53 MB (client), 103 MB (server, additional 5 MB for the tests)">
-  <!ENTITY openldap-time          "0.6 SBU (client), 1.1 SBU (server, additional 3.4 SBU for the tests)">
+  <!ENTITY openldap-buildsize     "53 MB (client), 103 MB (server)">
+  <!ENTITY openldap-time          "0.7 SBU (client), 1.3 SBU (server)">
 ]>
 
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -91,12 +91,12 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="db"/> (not recommended by the
-      developers due to license incompatiblities),
       <xref linkend="icu"/>,
-      <xref linkend="mariadb"/> or
-      <xref linkend="postgresql"/>,
       <xref linkend="pth"/>,
-      <xref linkend="unixodbc"/> and
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>
+      <xref linkend="unixodbc"/>,
+        <xref linkend="mariadb"/> or
+        <xref linkend="postgresql"/> or
+        <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>, and
+      <xref linkend="db"/> (not recommended by the developers)
     </para>
 
@@ -138,14 +138,13 @@
 
     <warning>
-      <para>
-        If upgrading from a previos installation that used Berkeley DB as
-        the backend, you will need to dump the database(s) using the
-        <command>slapcat</command> utility, relocate all files in
-        <filename class="directory">/var/lib/openldap</filename>, change all
-        instances of <option>bdb</option> to <option>mdb</option> in
-        <filename>/etc/openldap/slapd.conf</filename> and any files in
-        <filename class="directory">/etc/openldap/slapd.d</filename>, and import
-        using the <command>slapadd</command> utility after the installation is
-        completed.
+      <para>If upgrading from a previos installation that used Berkeley DB as
+      the backend, you will need to dump the database(s) using the
+      <command>slapcat</command> utility, relocate all files in
+      <filename class="directory">/var/lib/openldap</filename>, change all
+      instances of <option>bdb</option> to <option>mdb</option> in
+      <filename>/etc/openldap/slapd.conf</filename> and any files in
+      <filename class="directory">/etc/openldap/slapd.d</filename>, and import
+      using the <command>slapadd</command> utility after the installation is
+      completed.
       </para>
     </warning>
@@ -159,6 +158,7 @@
 
 <screen role="root"><userinput>groupadd -g 83 ldap &amp;&amp;
-useradd -c "OpenLDAP Daemon Owner" -d /var/lib/openldap -u 83 \
-        -g ldap -s /bin/false ldap</userinput></screen>
+useradd  -c "OpenLDAP Daemon Owner" \
+         -d /var/lib/openldap -u 83 \
+         -g ldap -s /bin/false ldap</userinput></screen>
 
     <para>
@@ -176,20 +176,27 @@
             --disable-static      \
             --disable-debug       \
+            --with-tls=openssl    \
+            --with-cyrus-sasl     \
             --enable-dynamic      \
             --enable-crypt        \
             --enable-spasswd      \
+            --enable-slapd        \
             --enable-modules      \
-            --enable-rlookups     \
             --enable-backends=mod \
-            --enable-overlays=mod \
+            --disable-ndb         \
+            --disable-sql         \
+            --disable-shell       \
             --disable-bdb         \
             --disable-hdb         \
-            --disable-ndb         \
-            --disable-sql &amp;&amp;
+            --enable-overlays=mod &amp;&amp;
+
 make depend &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k test</command>.
+      The tests appear to be fragile.  Errors may cause the tests to abort
+      prior to finishing, apparently due to timing issues.  The tests
+      take about 65 minutes and are processor independent.
+      To test the results, issue: <command>make test</command>.
     </para>
 
@@ -202,18 +209,10 @@
 install -v -dm700 -o ldap -g ldap /var/lib/openldap     &amp;&amp;
 install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &amp;&amp;
-chmod -v 640       /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
-chown -v root:ldap /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
-
-install -v -dm755              /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/{drafts,rfc,guide} /usr/share/doc/openldap-&openldap-version;</userinput></screen>
-
-    <para>
-      Having slapd configuration files and ldap databases in /var/lib/openldap
-      readable by anyone is a SECURITY ISSUE, especially since a file stores
-      admin password in PLAIN TEXT. That's why mode 640 and root:ldap ownership
-      were used. Owner is root, so only root can modify the file, and group is
-      ldap, so that the group which owns slapd daemon could read but not modify
-      the file in case of a security breach. 
-    </para>
+chmod   -v    640     /etc/openldap/slapd.{conf,ldif}   &amp;&amp;
+chown   -v  root:ldap /etc/openldap/slapd.{conf,ldif}   &amp;&amp;
+
+install -v -dm755 /usr/share/doc/openldap-&openldap-version; &amp;&amp;
+cp      -vfr      doc/{drafts,rfc,guide} \
+                  /usr/share/doc/openldap-&openldap-version;</userinput></screen>
 
   </sect2>
@@ -264,12 +263,4 @@
       <parameter>--enable-overlays</parameter>: This switch enables
       all available overlays.
-    </para>
-
-    <para>
-      <parameter>--disable-bdb --disable-hdb</parameter>: These
-      switches disable
-      <application>Berkeley DB</application> backend due to
-      license incompatiblities with latest version of
-      <application>Berkeley DB</application>.
     </para>
 
@@ -308,4 +299,15 @@
       </para>
     </note>
+
+    <para>
+      <command>install ...</command>, <command>chown ...</command>,
+      and <command>chmod ...</command>:
+      Having slapd configuration files and ldap databases in /var/lib/openldap
+      readable by anyone is a SECURITY ISSUE, especially since a file stores the
+      admin password in PLAIN TEXT. That's why mode 640 and root:ldap ownership
+      were used. The owner is root, so only root can modify the file, and group is
+      ldap, so that the group which owns slapd daemon could read but not modify
+      the file in case of a security breach.
+    </para>
 
   </sect2>
@@ -371,5 +373,5 @@
             The <ulink url="http://www.openldap.org/doc/admin24/"> OpenLDAP 2.4
             Administrator's Guide</ulink> (also installed locally in
-            <filename class="directory">
+            <filename class='directory'>
             /usr/share/doc/openldap-&openldap-version;/guide/admin</filename>).
           </para>
@@ -488,7 +490,6 @@
         <seg>
           /etc/openldap,
-          /usr/lib/openldap,
-          /usr/share/doc/openldap-&openldap-version;, and
-          /var/lib/openldap
+          /{usr,var}/lib/openldap, and
+          /usr/share/doc/openldap-&openldap-version;
         </seg>
       </seglistitem>
