aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/adjusting.xml5
-rw-r--r--chapter06/shadow.xml28
2 files changed, 30 insertions, 3 deletions
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index b8cd5b530..1231c2ca8 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -52,8 +52,9 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
<screen os="c"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
- <para>Note that <filename class="directory">/lib</filename> is now
- the prefix of our dynamic linker.</para>
+ <para>Note that on 64-bit systems <filename class="directory">/lib</filename> is
+ the location of our dynamic linker, but is accessed via a symbolic link
+ in /lib64.</para>
<note><para>On 32-bit systems the interpreter should be
/lib/ld-linux.so.2.</para></note>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index c9d63a4d0..e54c4ee54 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -67,9 +67,35 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
for user mailboxes that Shadow uses by default to the <filename
class="directory">/var/mail</filename> location used currently:</para>
-<screen><userinput remap="configure">sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
+<screen><userinput remap="pre">sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
-e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen>
+ <para>Now fix a bug that prevents <command>useradd</command> from
+ setting the shell entry in the /etc/passwd file. In this case we need a
+ short patch, but can include it directly here without the need for a
+ separate file:</para>
+
+<screen><userinput remap="pre">echo '--- src/useradd.c (old)
++++ src/useradd.c (new)
+@@ -2027,6 +2027,8 @@
+ is_shadow_grp = sgr_file_present ();
+ #endif
+
++ get_defaults ();
++
+ process_flags (argc, argv);
+
+ #ifdef ENABLE_SUBIDS
+@@ -2036,8 +2038,6 @@
+ (!user_id || (user_id &lt;= uid_max &amp;&amp; user_id >= uid_min));
+ #endif /* ENABLE_SUBIDS */
+
+- get_defaults ();
+-
+ #ifdef ACCT_TOOLS_SETUID
+ #ifdef USE_PAM
+ {' | patch -p0 -l</userinput></screen>
+
<note>
<para>If you chose to build Shadow with Cracklib support, run the following:</para>