aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/shadowpwd-dep.xml2
-rw-r--r--appendixa/shadowpwd-desc.xml18
-rw-r--r--appendixa/shadowpwd-shortdesc.xml17
-rw-r--r--appendixa/shadowpwd.xml1
-rw-r--r--chapter06/shadowpwd-inst.xml69
-rw-r--r--chapter06/shadowpwd.xml5
-rw-r--r--entities/shadow.ent2
7 files changed, 83 insertions, 31 deletions
diff --git a/appendixa/shadowpwd-dep.xml b/appendixa/shadowpwd-dep.xml
index dd842cb1f..242e65c4b 100644
--- a/appendixa/shadowpwd-dep.xml
+++ b/appendixa/shadowpwd-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Shadow Installation Dependencies</title>
diff --git a/appendixa/shadowpwd-desc.xml b/appendixa/shadowpwd-desc.xml
index b42ba9d5e..04b852660 100644
--- a/appendixa/shadowpwd-desc.xml
+++ b/appendixa/shadowpwd-desc.xml
@@ -1,15 +1,10 @@
-<sect2><title>Contents of Shadow</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<para>Last checked against version &shadow-contversion;.</para>
+<sect2><title>Descriptions</title>
-<sect3><title>Program Files</title>
-<para>chage, chfn, chpasswd, chsh, dpasswd, expiry, faillog, gpasswd,
-groupadd, groupdel, groupmod, groups, grpck, grpconv, grpunconv, lastlog,
-login, logoutd, mkpasswd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
-sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw) and
-vipw</para></sect3>
+<para>Last checked against version &shadow-contversion;.</para>
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
<sect4><title>chage</title>
<para>chage changes the number of days between password changes and the date of
@@ -132,10 +127,7 @@ those files, /etc/shadow and /etc/gshadow, respectively.</para></sect4>
</sect3>
-<sect3><title>Library Files</title>
-<para>libmisc.[a,so], libshadow.[a,so]</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
<sect4><title>libmisc</title>
<para>No description is currently available.</para></sect4>
diff --git a/appendixa/shadowpwd-shortdesc.xml b/appendixa/shadowpwd-shortdesc.xml
new file mode 100644
index 000000000..0b75bacb0
--- /dev/null
+++ b/appendixa/shadowpwd-shortdesc.xml
@@ -0,0 +1,17 @@
+<sect2><title>Contents of Shadow</title>
+
+<para>Last checked against version &shadow-contversion;.</para>
+
+<para>The Shadow package was created to strengthen the security
+of system passwords.</para>
+
+<para>Shadow installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>chage, chfn, chpasswd, chsh, dpasswd, expiry, faillog, gpasswd,
+groupadd, groupdel, groupmod, groups, grpck, grpconv, grpunconv, lastlog,
+login, logoutd, mkpasswd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
+sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw) and
+vipw</para></sect3>
+
+</sect2>
diff --git a/appendixa/shadowpwd.xml b/appendixa/shadowpwd.xml
index 5507442d0..6cfa9f238 100644
--- a/appendixa/shadowpwd.xml
+++ b/appendixa/shadowpwd.xml
@@ -3,6 +3,7 @@
<?dbhtml filename="shadow.html" dir="appendixa"?>
&aa-shadowpwd-down;
+&aa-shadowpwd-shortdesc;
&aa-shadowpwd-desc;
&aa-shadowpwd-dep;
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index c3d4f362f..4fbd05c89 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Shadow Password Suite</title>
@@ -7,27 +9,66 @@ regarding passwords, such as how to enable the more secure MD5 passwords
and how to get the most out of this Shadow package. The Shadow hint can
be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
-<para>Install the Shadow Password Suite by running the
-following commands:</para>
+<para>Prepare Shadow to be compiled:</para>
<para><screen><userinput>./configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--libdir=/usr/lib --enable-shared &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-cp etc/{limits,login.access} /etc &amp;&amp;
-sed 's%/var/spool/mail%/var/mail%' \
-&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs &amp;&amp;
-ln -s vipw /usr/sbin/vigr &amp;&amp;
-rm /bin/vipw &amp;&amp;
-mv /bin/sg /usr/bin &amp;&amp;
-mv /usr/lib/lib{shadow,misc}.so.0* /lib &amp;&amp;
-ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--libdir=/usr/lib --enable-shared</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Shadow uses two files to configure authentication settings for
+the system. Install those config files:</para>
+
+<para><screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen></para>
+
+<para><filename class="directory">/var/spool/mail</filename> is the
+old location of the user mailboxes. The location that is used nowadays
+is /var/mail. Issue the following command to modify the mailbox
+location:</para>
+
+<para><screen><userinput>sed 's%/var/spool/mail%/var/mail%' \
+&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs</userinput></screen></para>
+
+<para>According to the manpage of <userinput>vipw</userinput>,
+a <userinput>vigr</userinput> symlink should exist. Because the
+shadow installation procedure doesn't create this symlink, it
+must be created manually:</para>
+
+<para><screen><userinput>ln -s vipw /usr/sbin/vigr</userinput></screen></para>
+
+<para>The <filename>vipw</filename> link is currently pointing
+to a non-existing file. Since this file isn't needed here, remove
+it:</para>
+
+<para><screen><userinput>rm /bin/vipw</userinput></screen></para>
+
+<para>Move the <userinput>sg</userinput> program to the
+<filename class="directory">/usr/bin</filename> directory:</para>
+
+<para><screen><userinput>mv /bin/sg /usr/bin</userinput></screen></para>
+
+<para>Move Shadow's dynamic libraries to a more appropriate location:</para>
+
+<para><screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen></para>
+
+<para>The libraries have been moved, but some packages expect to
+find them in them in the
+<filename class="directory">/usr/lib</filename> directory. To account
+for this, create the following symlinks:</para>
+
+<para><screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen></para>
<para>Sh-utils and Shadow Password Suite each install a unique
<filename>groups</filename> program. If you wish, you may remove the
<filename>groups</filename> program installed by the Shadow Password
-Suite by running the following command:</para>
+Suite:</para>
<para><screen><userinput>rm /bin/groups</userinput></screen></para>
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index 6cb816613..cc8b60fc3 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -5,9 +5,8 @@
<screen>Estimated build time: &shadow-time;
Estimated required disk space: &shadow-compsize;</screen>
-&c6-shadowpwd-inst;
-&c6-shadowpwd-exp;
-&aa-shadowpwd-desc;
+&aa-shadowpwd-shortdesc;
&aa-shadowpwd-dep;
+&c6-shadowpwd-inst;
</sect1>
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 72036a29e..10cacc4ce 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -2,13 +2,13 @@
<!ENTITY c6-shadowpwd SYSTEM "../chapter06/shadowpwd.xml">
<!ENTITY c6-shadowpwd-inst SYSTEM "../chapter06/shadowpwd-inst.xml">
-<!ENTITY c6-shadowpwd-exp SYSTEM "../chapter06/shadowpwd-exp.xml">
<!ENTITY c6-cf-shadowpwd SYSTEM "../chapter06/config-shadowpwd.xml">
<!ENTITY aa-shadowpwd SYSTEM "../appendixa/shadowpwd.xml">
<!ENTITY aa-shadowpwd-desc SYSTEM "../appendixa/shadowpwd-desc.xml">
<!ENTITY aa-shadowpwd-dep SYSTEM "../appendixa/shadowpwd-dep.xml">
<!ENTITY aa-shadowpwd-down SYSTEM "../appendixa/shadowpwd-down.xml">
+<!ENTITY aa-shadowpwd-shortdesc SYSTEM "../appendixa/shadowpwd-shortdesc.xml">
<!ENTITY shadow-version "4.0.3">
<!ENTITY shadow-depversion "20001016">