Index: general.ent
===================================================================
--- general.ent	(revision abe290df94cd9141ae80d6001058a50253eb66a2)
+++ general.ent	(revision c507fdb39e91b4854828e13f98d252b7b1b7fe50)
@@ -254,5 +254,5 @@
 <!-- openssh (chapter 18) -->        
 <!-- rsync (chaptet 18) -->          
-<!ENTITY openldap-version             "2.2.20">
+<!ENTITY openldap-version             "2.2.24">
 <!ENTITY samba3-version               "3.0.11">
 <!ENTITY xinetd-version               "2.3.13">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision abe290df94cd9141ae80d6001058a50253eb66a2)
+++ introduction/welcome/changelog.xml	(revision c507fdb39e91b4854828e13f98d252b7b1b7fe50)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>April 4th, 2005 [randy]: Updated to 
+OpenLDAP-2.2.24</para></listitem>
 
 <listitem><para>April 4th, 2005 [igor]: Updated to OpenSSL-0.9.7f
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision abe290df94cd9141ae80d6001058a50253eb66a2)
+++ server/other/openldap.xml	(revision c507fdb39e91b4854828e13f98d252b7b1b7fe50)
@@ -9,6 +9,6 @@
 <!ENTITY openldap-md5sum "383691dbabe05ee2b72a3e9db2042a82">
 <!ENTITY openldap-size "2.6 MB">
-<!ENTITY openldap-buildsize "67 MB">
-<!ENTITY openldap-time "6.42 SBU">
+<!ENTITY openldap-buildsize "76.7 MB">
+<!ENTITY openldap-time "6.58 SBU">
 ]>
 
@@ -21,8 +21,10 @@
 <title><application>Open<acronym>LDAP</acronym></application>-&openldap-version;
 </title>
+<indexterm zone="openldap">
+<primary sortas="a-OpenLDAP">OpenLDAP</primary></indexterm>
 
 <sect2>
-<title>Introduction to <application>Open<acronym>LDAP</acronym></application>
-</title>
+<title>Introduction to 
+<application>Open<acronym>LDAP</acronym></application></title>
 
 <para>The <application>Open<acronym>LDAP</acronym></application> package
@@ -67,6 +69,6 @@
 
 <sect2>
-<title>Installation of <application>Open<acronym>LDAP</acronym></application>
-</title>
+<title>Installation of 
+<application>Open<acronym>LDAP</acronym></application></title>
 
 <para>Install <application>Open<acronym>LDAP</acronym></application> by
@@ -78,6 +80,9 @@
 make depend &amp;&amp;
 make &amp;&amp;
-make test &amp;&amp;
-make install &amp;&amp;
+make test</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 chmod 755 /usr/lib/libl*-2.2.so.7.0.13</command></userinput></screen>
 
@@ -110,5 +115,9 @@
 add 127.0.0.1 to the <parameter>slapd</parameter> line in the 
 <filename>/etc/hosts.allow</filename> file if you have a
-restrictive <filename>/etc/hosts.deny</filename> file.</para>
+restrictive <filename>/etc/hosts.deny</filename> file. If you logged the 
+output of the <command>make test</command>, an easy test to see if all the 
+tests succeeded is to issue <command>grep ">>>>> Test succeeded" 
+<replaceable>[logfilename]</replaceable> | wc -l</command>. You should have 
+<computeroutput>39</computeroutput> returned.</para>
 
 <para><command>chmod 755 /usr/lib/libl*-2.2.so.7.0.10</command>: This command 
@@ -118,9 +127,11 @@
 
 <sect2>
-<title>Configuring <application>Open<acronym>LDAP</acronym></application>
-</title>
-
-<sect3><title>Config files</title>
+<title>Configuring 
+<application>Open<acronym>LDAP</acronym></application></title>
+
+<sect3 id="openldap-config"><title>Config files</title>
 <para><filename>/etc/openldap/*</filename></para>
+<indexterm zone="openldap openldap-config">
+<primary sortas="e-etc-openldap">/etc/openldap/*</primary></indexterm>
 </sect3>
 
@@ -134,4 +145,10 @@
 <application>Open<acronym>LDAP</acronym></application> for your particular 
 needs.</para>
+<indexterm zone="openldap openldap-config">
+<primary sortas="e-etc-openldap-slapd.conf">/etc/openldap/slapd.conf</primary>
+</indexterm>
+<indexterm zone="openldap openldap-config">
+<primary sortas="e-etc-openldap-ldap.conf">/etc/openldap/ldap.conf</primary>
+</indexterm>
 
 <para>Resources to assist you with topics such as choosing a directory 
@@ -166,9 +183,11 @@
 <filename>slapd.conf</filename> file.</para></sect3>
 
-<sect3><title>Init Script</title>
+<sect3 id="openldap-init"><title>Init Script</title>
 <para>To automate the startup of the <acronym>LDAP</acronym> server at system 
 bootup, install the <filename>/etc/rc.d/init.d/openldap</filename> init script 
 included in the <xref linkend="intro-important-bootscripts"/> package using the 
 following command:</para>
+<indexterm zone="openldap openldap-init">
+<primary sortas="f-openldap">openldap</primary></indexterm>
 
 <screen><userinput><command>make install-openldap1</command></userinput></screen>
@@ -223,105 +242,201 @@
 <title>Contents</title>
 
-<para>The Open<acronym>LDAP</acronym> package contains
-<command>ldapadd</command>,
-<command>ldapcompare</command>,
-<command>ldapdelete</command>,
-<command>ldapmodify</command>,
-<command>ldapmodrdn</command>,
-<command>ldappasswd</command>,
-<command>ldapsearch</command>,
-<command>ldapwhoami</command>,
-<command>slapadd</command>,
-<command>slapcat</command>,
-<command>slapd</command>,
-<command>slapdn</command>,
-<command>slapindex</command>,
-<command>slappasswd</command>,
-<command>slaptest</command>,
-<command>slurpd</command>,
-<filename class="libraryfile">liblber</filename> and the 
-<filename class="libraryfile">libldap</filename> libraries.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>ldapadd, ldapcompare, ldapdelete, ldapmodify, ldapmodrdn, ldappasswd, 
+ldapsearch, ldapwhoami, slapadd, slapcat, slapd, slapdn, slapindex, 
+slappasswd, slaptest and slurpd</seg>
+<seg>liblber.[so,a], libldap.[so,a] and libldap_r.[so,a]</seg>
+<seg>/etc/openldap, /srv/ldap and /usr/share/openldap</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="ldapadd">
+<term><command>ldapadd</command></term>
+<listitem><para>opens a connection to an <acronym>LDAP</acronym> server, 
+binds and adds entries.</para>
+<indexterm zone="openldap ldapadd">
+<primary sortas="b-ldapadd">ldapadd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldapcompare">
+<term><command>ldapcompare</command></term>
+<listitem><para>opens a connection to an <acronym>LDAP</acronym> server, 
+binds and performs a compare using specified parameters.</para>
+<indexterm zone="openldap ldapcompare">
+<primary sortas="b-ldapcompare">ldapcompare</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldapdelete">
+<term><command>ldapdelete</command></term>
+<listitem><para> opens a connection to an <acronym>LDAP</acronym> server, 
+binds and deletes one or more entries.</para>
+<indexterm zone="openldap ldapdelete">
+<primary sortas="b-ldapdelete">ldapdelete</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldapmodify">
+<term><command>ldapmodify</command></term>
+<listitem><para>opens a connection to an <acronym>LDAP</acronym> server, 
+binds and modifies entries.</para>
+<indexterm zone="openldap ldapmodify">
+<primary sortas="b-ldapmodify">ldapmodify</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldapmodrdn">
+<term><command>ldapmodrdn</command></term>
+<listitem><para>opens a connection to an <acronym>LDAP</acronym> server, 
+binds and modifies the <acronym>RDN</acronym> of entries.</para>
+<indexterm zone="openldap ldapmodrdn">
+<primary sortas="b-ldapmodrdn">ldapmodrdn</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldappasswd">
+<term><command>ldappasswd</command></term>
+<listitem><para>is a tool to set the password of an <acronym>LDAP</acronym> 
+user.</para>
+<indexterm zone="openldap ldappasswd">
+<primary sortas="b-ldappasswd">ldappasswd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldapsearch">
+<term><command>ldapsearch</command></term>
+<listitem><para>opens a connection to an <acronym>LDAP</acronym> server, 
+binds and performs a search using specified parameters.</para>
+<indexterm zone="openldap ldapsearch">
+<primary sortas="b-ldapsearch">ldapsearch</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ldapwhoami">
+<term><command>ldapwhoami</command></term>
+<listitem><para>opens a connection to an <acronym>LDAP</acronym> server, 
+binds and displays whoami information.</para>
+<indexterm zone="openldap ldapwhoami">
+<primary sortas="b-ldapwhoami">ldapwhoami</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slapadd">
+<term><command>slapadd</command></term>
+<listitem><para>is used to add entries specified in <acronym>LDAP</acronym> 
+Directory Interchange Format (<acronym>LDIF</acronym>) to an 
+<acronym>LDAP</acronym> database.</para>
+<indexterm zone="openldap slapadd">
+<primary sortas="b-slapadd">slapadd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slapcat">
+<term><command>slapcat</command></term>
+<listitem><para>is used to generate an <acronym>LDAP</acronym> 
+<acronym>LDIF</acronym> output based upon the contents of a slapd 
+database.</para>
+<indexterm zone="openldap slapcat">
+<primary sortas="b-slapcat">slapcat</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slapd">
+<term><command>slapd</command></term>
+<listitem><para>is the stand-alone <acronym>LDAP</acronym> server.</para>
+<indexterm zone="openldap slapd">
+<primary sortas="b-slapd">slapd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slapdn">
+<term><command>slapdn</command></term>
+<listitem><para>checks a list of string-represented <acronym>DN</acronym>s 
+based on schema syntax.</para>
+<indexterm zone="openldap slapdn">
+<primary sortas="b-slapdn">slapdn</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slapindex">
+<term><command>slapindex</command></term>
+<listitem><para>is used to regenerate slapd indices based upon the current 
+contents of a database.</para>
+<indexterm zone="openldap slapindex">
+<primary sortas="b-slapindex">slapindex</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slappasswd">
+<term><command>slappasswd</command></term>
+<listitem><para>is an <application>Open<acronym>LDAP</acronym></application> 
+password utility.</para>
+<indexterm zone="openldap slappasswd">
+<primary sortas="b-slappasswd">slappasswd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slaptest">
+<term><command>slaptest</command></term>
+<listitem><para>checks the sanity of the <filename>slapd.conf</filename> 
+file.</para>
+<indexterm zone="openldap slaptest">
+<primary sortas="b-slaptest">slaptest</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="slurpd">
+<term><command>slurpd</command></term>
+<listitem><para>is the stand-alone <acronym>LDAP</acronym> replication 
+server.</para>
+<indexterm zone="openldap slurpd">
+<primary sortas="b-slurpd">slurpd</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="liblber">
+<term><filename class='libraryfile'>liblber.[so,a]</filename></term>
+<listitem><para>is a set of lightweight Basic Encoding Rules routines. These 
+routines are used by the <acronym>LDAP</acronym> library routines to encode 
+and decode <acronym>LDAP</acronym> protocol elements using the (slightly 
+simplified) Basic Encoding Rules defined by <acronym>LDAP</acronym>. They are 
+not normally used directly by an <acronym>LDAP</acronym> application program 
+except in the handling of controls and extended operations.</para>
+<indexterm zone="openldap liblber">
+<primary sortas="c-liblber">liblber.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libldap">
+<term><filename class='libraryfile'>libldap.[so,a]</filename></term>
+<listitem><para>supports the <acronym>LDAP</acronym> programs and provide 
+functionality for other programs interacting with 
+<acronym>LDAP</acronym>.</para>
+<indexterm zone="openldap libldap">
+<primary sortas="c-libldap">libldap.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libldap_r">
+<term><filename class='libraryfile'>libldap_r.[so,a]</filename></term>
+<listitem><para>contains the functions required by the <acronym>LDAP</acronym> 
+programs to produce the results from <acronym>LDAP</acronym> requests.</para>
+<indexterm zone="openldap libldap_r">
+<primary sortas="c-libldap_r">libldap_r.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
-<sect2><title>Description</title>
-
-<sect3><title>ldapadd</title>
-<para><command>ldapadd</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and adds entries.</para></sect3>
-
-<sect3><title>ldapcompare</title>
-<para><command>ldapcompare</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and performs a compare using specified
-parameters.</para></sect3>
-
-<sect3><title>ldapdelete</title>
-<para><command>ldapdelete</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and deletes one or more entries.</para>
-</sect3>
-
-<sect3><title>ldapmodify</title>
-<para><command>ldapmodify</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and modifies entries.</para></sect3>
-
-<sect3><title>ldapmodrdn</title>
-<para><command>ldapmodrdn</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and modifies the 
-<acronym>RDN</acronym> of entries.</para></sect3>
-
-<sect3><title>ldappasswd</title>
-<para><command>ldappasswd</command> is a tool to set the password of an
-<acronym>LDAP</acronym> user.</para></sect3>
-
-<sect3><title>ldapsearch</title>
-<para><command>ldapsearch</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and performs a search using specified
-parameters.</para></sect3>
-
-<sect3><title>ldapwhoami</title>
-<para><command>ldapwhoami</command> opens a connection to an 
-<acronym>LDAP</acronym> server, binds and displays whoami information.</para>
-</sect3>
-
-<sect3><title>slapadd</title>
-<para><command>slapadd</command> is used to add entries specified in
-<acronym>LDAP</acronym> Directory Interchange Format (<acronym>LDIF</acronym>) 
-to an <acronym>LDAP</acronym> database.</para></sect3>
-
-<sect3><title>slapcat</title>
-<para><command>slapcat</command> is used to generate an <acronym>LDAP</acronym>
-<acronym>LDIF</acronym> output
-based upon the contents of a slapd database.</para></sect3>
-
-<sect3><title>slapd</title>
-<para><command>slapd</command> is the stand-alone <acronym>LDAP</acronym> 
-server.</para></sect3>
-
-<sect3><title>slapdn</title>
-<para><command>slapdn</command> checks a list of string-represented 
-<acronym>DN</acronym>s based on schema syntax.</para></sect3>
-
-<sect3><title>slapindex</title>
-<para><command>slapindex</command> is used to regenerate slapd
-indices based upon the current contents of a database.</para></sect3>
-
-<sect3><title>slappasswd</title>
-<para><command>slappasswd</command> is an Open<acronym>LDAP</acronym> password
-utility.</para></sect3>
-
-<sect3><title>slaptest</title>
-<para><command>slaptest</command> checks the sanity of the 
-<filename>slapd.conf</filename> file.</para></sect3>
-
-<sect3><title>slurpd</title>
-<para><command>slurpd</command> is the stand-alone
-<acronym>LDAP</acronym> replication server.</para></sect3>
-
-<sect3><title>liblber and libldap</title>
-<para>These libraries support the <acronym>LDAP</acronym> programs and provide 
-functionality for other programs interacting with <acronym>LDAP</acronym>.
-</para></sect3>
-
-</sect2>
-
 </sect1>
