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 @@
+
+
Shadow Installation Dependencies
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 @@
-Contents of Shadow
+
+
+Descriptions
Last checked against version &shadow-contversion;.
-Program Files
-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
-
-Descriptions
+Program file descriptions
chage
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.
-Library Files
-libmisc.[a,so], libshadow.[a,so]
-
-Descriptions
+Library file descriptions
libmisc
No description is currently available.
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 @@
+Contents of Shadow
+
+Last checked against version &shadow-contversion;.
+
+The Shadow package was created to strengthen the security
+of system passwords.
+
+Shadow installs the following:
+
+Program Files
+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
+
+
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 @@
&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 @@
+
+
Installation of Shadow Password Suite
@@ -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 .
-Install the Shadow Password Suite by running the
-following commands:
+Prepare Shadow to be compiled:
./configure --prefix=/usr \
- --libdir=/usr/lib --enable-shared &&
-make &&
-make install &&
-cp etc/{limits,login.access} /etc &&
-sed 's%/var/spool/mail%/var/mail%' \
- etc/login.defs.linux > /etc/login.defs &&
-ln -s vipw /usr/sbin/vigr &&
-rm /bin/vipw &&
-mv /bin/sg /usr/bin &&
-mv /usr/lib/lib{shadow,misc}.so.0* /lib &&
-ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &&
+ --libdir=/usr/lib --enable-shared
+
+Continue with compiling the package:
+
+make
+
+Install the package:
+
+make install
+
+Shadow uses two files to configure authentication settings for
+the system. Install those config files:
+
+cp etc/{limits,login.access} /etc
+
+/var/spool/mail 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:
+
+sed 's%/var/spool/mail%/var/mail%' \
+ etc/login.defs.linux > /etc/login.defs
+
+According to the manpage of vipw,
+a vigr symlink should exist. Because the
+shadow installation procedure doesn't create this symlink, it
+must be created manually:
+
+ln -s vipw /usr/sbin/vigr
+
+The vipw link is currently pointing
+to a non-existing file. Since this file isn't needed here, remove
+it:
+
+rm /bin/vipw
+
+Move the sg program to the
+/usr/bin directory:
+
+mv /bin/sg /usr/bin
+
+Move Shadow's dynamic libraries to a more appropriate location:
+
+mv /usr/lib/lib{shadow,misc}.so.0* /lib
+
+The libraries have been moved, but some packages expect to
+find them in them in the
+/usr/lib directory. To account
+for this, create the following symlinks:
+
+ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &&
ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so
Sh-utils and Shadow Password Suite each install a unique
groups program. If you wish, you may remove the
groups program installed by the Shadow Password
-Suite by running the following command:
+Suite:
rm /bin/groups
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 @@
Estimated build time: &shadow-time;
Estimated required disk space: &shadow-compsize;
-&c6-shadowpwd-inst;
-&c6-shadowpwd-exp;
-&aa-shadowpwd-desc;
+&aa-shadowpwd-shortdesc;
&aa-shadowpwd-dep;
+&c6-shadowpwd-inst;
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 @@
-
+