Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ appendices/glossary.xml	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -15,4 +15,7 @@
 <glossdef><para>Asymmetric Digital Subscriber Line</para></glossdef></glossentry>
 
+<glossentry id="gAFS"><glossterm><acronym>AFS</acronym></glossterm>
+<glossdef><para>Andrew File System</para></glossdef></glossentry>
+
 <glossentry id="gAIFF"><glossterm><acronym>AIFF</acronym></glossterm>
 <glossdef><para>Audio Interchange File Format</para></glossdef></glossentry>
Index: index.xml
===================================================================
--- index.xml	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ index.xml	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -3,7 +3,7 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040427">
-<!ENTITY releasedate "April 27th, 2004">
-<!ENTITY pubdate "2004-04-27">
+<!ENTITY version "CVS-20040428">
+<!ENTITY releasedate "April 28th, 2004">
+<!ENTITY pubdate "2004-04-28">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ introduction/welcome/changelog.xml	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>April 28th, 2004 [igor]: Finished the Heimdal
+addition.</para></listitem>
 
 <listitem><para>April 27th, 2004 [igor]: Rolled back to
Index: postlfs/security/heimdal/heimdal-desc.xml
===================================================================
--- postlfs/security/heimdal/heimdal-desc.xml	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ postlfs/security/heimdal/heimdal-desc.xml	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -66,7 +66,117 @@
 
 </sect2>
-<!--
+
 <sect2><title>Description</title>
 
+<sect3><title>afslog</title>
+<para><command>afslog</command> obtains AFS tokens for a number of
+cells.</para></sect3>
+
+<sect3><title>hprop</title>
+<para><command>hprop</command> takes a principal database in a specified
+format and converts it into a stream of Heimdal database
+records.</para></sect3>
+
+<sect3><title>hpropd</title>
+<para><command>hpropd</command> receives a database sent by
+<command>hprop</command> and writes it as a local
+database.</para></sect3>
+
+<sect3><title>kadmin</title>
+<para><command>kadmin</command> is an utility used to make modifications
+to the Kerberos database.</para></sect3>
+
+<sect3><title>kadmind</title>
+<para><command>kadmind</command> is a server for administrative access
+to Kerberos database.</para></sect3>
+
+<sect3><title>kauth, kinit</title>
+<para><command>kauth</command> and <command>kinit</command> are used to
+authenticate to the Kerberos server as principal and acquire a ticket
+granting ticket that can later be used to obtain tickets for other
+services.</para></sect3>
+
+<sect3><title>kdc</title>
+<para><command>kdc</command> is a Kerberos 5 server.</para></sect3>
+
+<sect3><title>kdestroy</title>
+<para><command>kdestroy</command> removes the current set of
+tickets.</para></sect3>
+
+<sect3><title>kf</title>
+<para><command>kf</command> is a program which forwards tickets to a
+remote host through an authenticated and encrypted
+stream.</para></sect3>
+
+<sect3><title>kfd</title>
+<para><command>kfd</command> receives forwarded tickets.</para></sect3>
+
+<sect3><title>kgetcred</title>
+<para><command>kgetcred</command> obtains a ticket for a
+service.</para></sect3>
+
+<sect3><title>klist</title>
+<para><command>klist</command> reads and displays the current tickets in
+the credential cache.</para></sect3>
+
+<sect3><title>kpasswd</title>
+<para><command>kpasswd</command> is a program for changing Kerberos 5
+passwords.</para></sect3>
+
+<sect3><title>kpasswdd</title>
+<para><command>kpasswdd</command> is a Kerberos 5 password changing
+server.</para></sect3>
+
+<sect3><title>krb5-config</title>
+<para><command>krb5-config</command> gives information on how to link
+programs against Heimdal libraries.</para></sect3>
+
+<sect3><title>kstash</title>
+<para><command>kstash</command> stores the <acronym>KDC</acronym> master
+password in a file.</para></sect3>
+
+<sect3><title>ktutil</title>
+<para><command>ktutil</command> is a program for managing Kerberos
+keytabs.</para></sect3>
+
+<sect3><title>kx</title>
+<para><command>kx</command> is a program which securely forwards X
+connections.</para></sect3>
+
+<sect3><title>kxd</title>
+<para><command>kxd</command> is the daemon for
+<command>kx</command>.</para></sect3>
+
+<sect3><title>otp</title>
+<para><command>otp</command> manages one-time passwords.</para></sect3>
+
+<sect3><title>otpprint</title>
+<para><command>otpprint</command> prints lists of one-time
+passwords.</para></sect3>
+
+<sect3><title>rxtelnet</title>
+<para><command>rxtelnet</command> program starts an
+<command>xterm</command> window with a telnet to given host and forwards
+X connections.</para></sect3>
+
+<sect3><title>rxterm</title>
+<para><command>rxterm</command> starts a secure remote
+<command>xterm</command>.</para></sect3>
+
+<sect3><title>string2key</title>
+<para><command>string2key</command> maps a password into a
+key.</para></sect3>
+
+<sect3><title>tenletxr</title>
+<para><command>tenletxr</command> forwards X connections
+backwards.</para></sect3>
+
+<sect3><title>verify_krb5_conf</title>
+<para><command>verify_krb5_conf</command> checks
+<filename>krb5.conf</filename> for obvious errors.</para></sect3>
+
+<sect3><title>xnlock</title>
+<para><command>xnlock</command> is a program that acts as a screen saver
+for workstations running X.</para></sect3>
+
 </sect2>
--->
Index: postlfs/security/heimdal/heimdal-exp.xml
===================================================================
--- postlfs/security/heimdal/heimdal-exp.xml	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ postlfs/security/heimdal/heimdal-exp.xml	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -10,5 +10,5 @@
 If you want to preserve all your existing Inetutils package daemons,
 install the Heimdal daemons into <filename
-    class="directory">/usr/sbin/heimdal</filename> (or wherever you want).
+class="directory">/usr/sbin/heimdal</filename> (or wherever you want).
 Since these programs will be called from <command>(x)inetd</command> or
 <command>rc</command> scripts, it really doesn't matter where they live,
@@ -21,10 +21,34 @@
 </para></note>
 
-<para><command>cp /usr/bin/login /bin &amp;&amp; mv /usr/bin/su /bin</command>:
+<para>
+<screen><command>mv /bin/login /bin/login.shadow
+mv /bin/su /bin/su.coreutils
+cp /usr/bin/login /bin
+mv /usr/bin/su /bin</command></screen>
 The <command>login</command> and <command>su</command> programs
 installed by Heimdal belong in <filename
 class="directory">/bin</filename> directory. The
 <command>login</command> program is copied because Heimdal is expecting
-to find it in <filename class="directory">/usr/bin</filename>.
+to find it in <filename class="directory">/usr/bin</filename>. We
+preserve the old executables before the move to keep things sane should
+breaks occur.
+</para>
+
+<para>
+<screen><command>mv /usr/lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib
+mv /usr/lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib
+mv /usr/lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib
+mv /usr/lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib
+ln -sf ../../lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib
+ln -sf ../../lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib
+ln -sf ../../lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib
+ln -sf ../../lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib</command></screen>
+The <command>login</command> and <command>su</command> programs
+installed by Heimdal link against Heimdal libraries as well as crypto
+and db libraries. We move these libraries to <filename
+class="directory">/lib</filename> to be <acronym>FHS</acronym>
+compliant and in case when the <filename
+class="directory">/usr</filename> is located on separate partition which
+may not be always mounted.
 </para>
 
Index: postlfs/security/heimdal/heimdal-inst.xml
===================================================================
--- postlfs/security/heimdal/heimdal-inst.xml	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ postlfs/security/heimdal/heimdal-inst.xml	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -22,6 +22,16 @@
 make &amp;&amp;
 make install &amp;&amp;
+mv /bin/login /bin/login.shadow &amp;&amp;
+mv /bin/su /bin/su.coreutils &amp;&amp;
 cp /usr/bin/login /bin &amp;&amp;
-mv /usr/bin/su /bin</command></userinput></screen>
+mv /usr/bin/su /bin &amp;&amp;
+mv /usr/lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib &amp;&amp;
+mv /usr/lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib &amp;&amp;
+mv /usr/lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib &amp;&amp;
+mv /usr/lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib &amp;&amp;
+ln -sf ../../lib/lib{otp.so.0,otp.so.0.1.4,kafs.so.0,kafs.so.0.4.0} /usr/lib &amp;&amp;
+ln -sf ../../lib/lib{krb5.so.17,krb5.so.17.3.0,asn1.so.6,asn1.so.6.0.2} /usr/lib &amp;&amp;
+ln -sf ../../lib/lib{roken.so.16,roken.so.16.0.3,crypto.so.0.9.7} /usr/lib &amp;&amp;
+ln -sf ../../lib/lib{com_err.so.1,com_err.so.1.1.1,db-4.1.so} /usr/lib</command></userinput></screen>
 
 </sect2>
Index: postlfs/security/heimdal/heimdal.ent
===================================================================
--- postlfs/security/heimdal/heimdal.ent	(revision f60a23330ff58cc96ea4bbfc656d5c26275f9f10)
+++ postlfs/security/heimdal/heimdal.ent	(revision 80e192ae148de86b8a57c0539dcd9a4667a557fb)
@@ -6,5 +6,5 @@
 <!ENTITY heimdal-desc SYSTEM "heimdal-desc.xml">
 <!ENTITY heimdal-version "0.6.1">
-<!ENTITY heimdal-download-http "">
+<!ENTITY heimdal-download-http "http://ftp.vc-graz.ac.at/mirror/crypto/kerberos/heimdal/heimdal-&heimdal-version;.tar.gz">
 <!ENTITY heimdal-download-ftp "ftp://ftp.pdc.kth.se/pub/heimdal/src/heimdal-&heimdal-version;.tar.gz">
 <!ENTITY heimdal-size "3.2 MB">
