From 2a97593553736fc01983a7aea29aaed140d1a9e2 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 19 Feb 2017 23:06:02 +0000
Subject: Add a fix (embeeded patch) to shadow to fix an upstream bug. Minor
 text change in adjusting toolchanin.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11189 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/shadow.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'chapter06/shadow.xml')

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>
 
-- 
cgit v1.2.3-54-g00ecf