Index: general.ent
===================================================================
--- general.ent	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ general.ent	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 25th, &year;">
+<!ENTITY releasedate  "March 26th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ introduction/welcome/changelog.xml	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -46,4 +46,18 @@
 
     <listitem>
+      <para>March 26th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Fix modification of openldap instructions
+          disabling incompatible use of Berkeley DB.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to samba-4.2.0. Fixes
+          <ulink url="&blfs-ticket-root;6201">#6201</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 25th, 2015</para>
       <itemizedlist>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ networking/netprogs/samba.xml	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -7,8 +7,8 @@
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "8fed0f23a672e6a8d0716d96aca88671">
-  <!ENTITY samba-size          "19 MB">
-  <!ENTITY samba-buildsize     "416 MB (additional 397 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
-  <!ENTITY samba-time          "2.7 SBU, using parallelism=4 (additional 4.5 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
+  <!ENTITY samba-md5sum        "5ef28ee4cda243d07a0066f038b7d6e0">
+  <!ENTITY samba-size          "20 MB">
+  <!ENTITY samba-buildsize     "485 MB (additional 399 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "2.1 SBU, using parallelism=4 (additional 5.5 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -70,5 +70,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libxslt"/> (for documentation)
+      <xref linkend="libxslt"/> (for documentation) and
+      <xref linkend="openldap"/>
     </para>
 
@@ -78,18 +79,21 @@
       <xref linkend="cups"/>,
       <xref linkend="gnutls"/>,
+      <xref linkend="libarchive"/>,
       <xref linkend="libcap-pam"/>,
       <xref linkend="libgpg-error"/>,
       <xref linkend="linux-pam"/>,
       <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/>,
       <xref linkend="popt"/>,
       <xref linkend="valgrind"/> (optionally used by the test suite),
       <xref linkend="xfsprogs"/>,
+      <ulink url="https://ctdb.samba.org/">ctdb</ulink>,
       <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
-      <ulink url="http://ctdb.samba.org/">ctdb</ulink>,
+      <ulink url="http://www.h5l.org/">Heimdal</ulink>,
       <ulink url="http://ftp.de.debian.org/debian/pool/main/liba/libaio/">libaio</ulink>,
       <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
-      <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
-      <ulink url="http://tdb.samba.org/">tdb</ulink>
+      <ulink url="https://www.samba.org/ftp/ldb/">ldb</ulink>,
+      <ulink url="http://www.openafs.org/">OpenAFS</ulink>,
+      <ulink url="https://tevent.samba.org/">tevent</ulink>, and
+      <ulink url="https://tdb.samba.org/">tdb</ulink>
     </para>
 
@@ -103,11 +107,10 @@
 
     <note>
-      <para>If you wish to run the test suite after the binaries are built,
-      you must add the <option>-/-enable-socket-wrapper</option> 
-      and <option>-/-enable-selftest</option> parameters to
-      the <command>configure</command> script below. You may want to run
-      <command>configure</command> with the <option>-/-help</option> parameter
-      first. There may be other parameters needed to take advantage of
-      optional dependencies.</para>
+      <para>If you wish to run the test suite after the binaries are built, you
+      must add the <option>--enable-selftest</option> parameter to the
+      <command>configure</command> script below. You may want to run
+      <command>configure</command> with the <option>--help</option> parameter
+      first. There may be other parameters needed to take advantage of optional
+      dependencies.</para>
     </note>
 
@@ -122,6 +125,5 @@
     --with-pammodulesdir=/lib/security  \
     --without-systemd                   \
-    --enable-fhs                        \
-    --enable-nss-wrapper                &amp;&amp;
+    --enable-fhs                        &amp;&amp;
 
 make</userinput></screen>
@@ -181,7 +183,4 @@
     <para><parameter>--enable-fhs</parameter>: Assigns all other file paths in
     a manner compliant with the Filesystem Hierarchy Standard (FHS).</para>
-
-    <para><parameter>--enable-nss-wrapper</parameter>: Builds the nss-wrapper
-    library.</para>
 
     <para><parameter>--without-systemd</parameter>: Disable
@@ -468,32 +467,38 @@
       <seglistitem>
 
-        <seg>cifsdd, dbwrap_tool, eventlogadm, gentest, ldbadd, ldbdel, ldbedit,
-        ldbmodify, ldbrename, ldbsearch, locktest, masktest, ndrdump, net, nmbd,
-        nmblookup, nmblookup4, ntdbbackup, ntdbdump, ntdbrestore, ntdbtool,
-        ntlm_auth, oLschema2ldif, pdbedit, pidl, profiles, regdiff, regpatch,
-        regshell, regtree, rpcclient, samba, samba_dnsupdate, samba_kcc,
-        samba-regedit, samba_spnupdate, samba-tool, samba_upgradedns, sharesec,
-        smbcacls, smbclient, smbclient4, smbcontrol, smbcquotas, smbd, smbget,
-        smbpasswd, smbspool, smbstatus, smbtar, smbta-util, smbtorture, smbtree,
-        tdbbackup, tdbdump, tdbrestore, tdbtool, testparm, wbinfo, and
-        winbindd</seg>
-
-        <seg>libdcerpc-atsvc.so, libdcerpc-binding.so, libdcerpc-samr.so,
-        libdcerpc-server.so, libdcerpc.so, libgensec.so, libndr-krb5pac.so,
-        libndr-nbt.so, libndr.so, libndr-standard.so, libnetapi.so,
-        libnss_winbind.so, libnss_wins.so, libpdb.so, libregistry.so,
-        libsamba-credentials.so, libsamba-hostconfig.so, libsamba-policy.so,
-        libsamba-util.so, libsamdb.so, libsmbclient-raw.so, libsmbclient.so,
-        libsmbconf.so, libsmbldap.so, libsmbsharemodes.so, libtevent-util.so,
-        libtorture.so, libwbclient.so, mit_samba.so, and
-        winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so PAM
-        libraries; and assorted character set, filesystem and support modules
-        under /usr/lib/{python&python2-majorver;,samba}</seg>
+        <seg>
+          cifsdd, dbwrap_tool, eventlogadm, gentest, ldbadd, ldbdel, ldbedit,
+          ldbmodify, ldbrename, ldbsearch, locktest, masktest, ndrdump, net,
+          nmbd, nmblookup, nmblookup4, ntdbbackup, ntdbdump, ntdbrestore,
+          ntdbtool, ntlm_auth, oLschema2ldif, pdbedit, pidl, profiles, regdiff,
+          regpatch, regshell, regtree, rpcclient, samba, samba_dnsupdate,
+          samba_kcc, samba-regedit, samba_spnupdate, samba-tool,
+          samba_upgradedns, sharesec, smbcacls, smbclient, smbclient4,
+          smbcontrol, smbcquotas, smbd, smbget, smbpasswd, smbspool, smbstatus,
+          smbtar, smbta-util, smbtorture, smbtree, tdbbackup, tdbdump,
+          tdbrestore, tdbtool, testparm, wbinfo, and winbindd
+        </seg>
+
+        <seg>
+          libdcerpc-atsvc.so, libdcerpc-binding.so, libdcerpc-samr.so,
+          libdcerpc-server.so, libdcerpc.so, libgensec.so, libndr-krb5pac.so,
+          libndr-nbt.so, libndr.so, libndr-standard.so, libnetapi.so,
+          libnss_winbind.so, libnss_wins.so, libregistry.so,
+          libsamba-credentials.so, libsamba-hostconfig.so, libsamba-passdb.so,
+          libsamba-policy.so, libsamba-util.so, libsamdb.so,
+          libsmbclient-raw.so, libsmbclient.so, libsmbconf.so, libsmbldap.so,
+          libtevent-util.so, libtorture.so, libwbclient.so, mit_samba.so, and
+          winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so PAM
+          libraries; and assorted character set, filesystem and support modules
+          under /usr/lib/{python&python2-majorver;,samba}
+        </seg>
         
-        <seg>/etc/samba, /run/samba, /usr/include/samba-4.0,
-        /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/{Samba{3,4},Wireshark},
-        /usr/lib/python&python2-majorver;/site-packages/samba, /usr/lib/samba,
-        /usr/share/doc/samba-&samba-version;, /usr/share/samba, and
-        /var/{cache,lib,lock,log,run}/samba</seg>
+        <seg>
+          /etc/samba, /run/samba, /usr/include/samba-4.0,
+          /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/{Samba{3,4},Wireshark},
+          /usr/lib/python&python2-majorver;/site-packages/samba,
+          /usr/lib/samba, /usr/share/doc/samba-&samba-version;,
+          /usr/share/samba, and /var/{cache,lib,lock,log,run}/samba
+        </seg>
 
       </seglistitem>
@@ -895,5 +900,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libsmbsharemodes">
         <term><filename class='libraryfile'>libsmbsharemodes.so</filename></term>
@@ -905,5 +910,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="libwbclient">
Index: packages.ent
===================================================================
--- packages.ent	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ packages.ent	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -351,5 +351,5 @@
 <!ENTITY rpcbind-version              "0.2.2">
 <!ENTITY rsync-version                "3.1.1">
-<!ENTITY samba-version                "4.1.17">
+<!ENTITY samba-version                "4.2.0">
 <!ENTITY wget-version                 "1.16.3">
 <!ENTITY wireless-tools-version       "29">
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ postlfs/security/cyrus-sasl.xml	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -249,5 +249,5 @@
       <para>
         See
-        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/sysadmin.html"/>
+        <ulink url="/usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/sysadmin.html"/>
         for information on what to include in the application configuration files.
       </para>
@@ -255,5 +255,5 @@
       <para>
         See
-        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/LDAP_SASLAUTHD"/>
+        <ulink url="/usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/LDAP_SASLAUTHD"/>
         for configuring <command>saslauthd</command> with
         <application>OpenLDAP</application>.
@@ -262,5 +262,5 @@
       <para>
         See
-        <ulink url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/gssapi.html"/>
+        <ulink url="/usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/gssapi.html"/>
         for configuring <command>saslauthd</command> with <application>Kerberos</application>.
       </para>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ server/other/openldap.xml	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -118,7 +118,7 @@
       <para>
         If you only need to install the client side <command>ldap*</command>
-        binaries, corresponding man pages, libraries and header files (referred to
-        as a <quote>client-only</quote> install), issue these
-        commands instead of the following ones (no test suite available):
+        binaries, corresponding man pages, libraries and header files (referred
+        to as a <quote>client-only</quote> install), issue these commands
+        instead of the following ones (no test suite available):
       </para>
 
@@ -143,4 +143,17 @@
 
     </note>
+ 
+    <warning>
+      <para>If upgrading from a previos installation that used Berkely 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>
 
     <para>
@@ -183,5 +196,5 @@
             --disable-bdb         \ 
             --disable-hdb         \ 
-            --enable-overlays=mod \
+            --enable-overlays=mod &amp;&amp;
 
 make depend &amp;&amp;
@@ -199,13 +212,14 @@
 <screen role="root"><userinput>make install &amp;&amp;
 
-chmod -v 700 /var/lib/openldap                                         &amp;&amp;
-chown -v -R ldap:ldap /var/lib/openldap                                &amp;&amp;
-chmod -v 640 /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}       &amp;&amp;
-chown -v root:ldap /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} &amp;&amp;
-install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d                &amp;&amp;
-
-install -v -dm755  /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/drafts /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/rfc    /usr/share/doc/openldap-&openldap-version; &amp;&amp;
+chmod -v 700 /var/lib/openldap                          &amp;&amp;
+chown -v -R ldap:ldap /var/lib/openldap                 &amp;&amp;
+chmod -v 640 /etc/openldap/slapd.{conf,ldif}            &amp;&amp;
+chown -v root:ldap /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
+sed 's@bdb@mdb@g' -i /etc/openldap/slapd.conf           &amp;&amp;
+install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &amp;&amp;
+
+install -v -dm755  /usr/share/doc/openldap-&openldap-version;  &amp;&amp;
+cp -vfr doc/drafts /usr/share/doc/openldap-&openldap-version;  &amp;&amp;
+cp -vfr doc/rfc    /usr/share/doc/openldap-&openldap-version;  &amp;&amp;
 cp -vfr doc/guide  /usr/share/doc/openldap-&openldap-version;</userinput></screen>
 
@@ -293,4 +307,11 @@
       SLPv2 support. Use it if you have installed
       <ulink url="http://www.openslp.org/">OpenSLP</ulink>.
+    </para>
+ 
+    <para>
+      <command>sed 's@bdb@mdb@g' -i /etc/openldap/slapd.conf</command>: This
+      command changes the default backend from the deprecated Berkely DB
+      (which was not included in the available backends) to LMDB as is
+      recommended by the OpenLDAP developers.
     </para>
 
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision f141376ef95a00e168b3be70bd2fc33d6d29a8e0)
+++ xsoft/office/libreoffice.xml	(revision defca6192f23a32d5cc3272d86187ed93908fad7)
@@ -458,5 +458,5 @@
   for i in $LO_PREFIX/share/icons/hicolor/32x32/apps/*; do
     ln -svf $i /usr/share/pixmaps
-  done&amp;&amp;
+  done &amp;&amp;
 
   # Desktop menu entries
