From bb62fd7837348eb8b277051626ad4af0db7f3741 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Thu, 25 Aug 2016 11:24:38 +0200
Subject: [PATCH] fix regression in useradd - not processing defaults properly
 (#1369979)

---
 shadow-4.3.1-process-defaults.patch | 21 +++++++++++++++++++++
 shadow-utils.spec                   |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 shadow-4.3.1-process-defaults.patch

diff --git a/shadow-4.3.1-process-defaults.patch b/shadow-4.3.1-process-defaults.patch
new file mode 100644
index 0000000..b337376
--- /dev/null
+++ b/shadow-4.3.1-process-defaults.patch
@@ -0,0 +1,21 @@
+diff -up shadow-4.3.1/src/useradd.c.process-defaults shadow-4.3.1/src/useradd.c
+--- shadow-4.3.1/src/useradd.c.process-defaults	2016-08-22 17:30:01.000000000 +0200
++++ shadow-4.3.1/src/useradd.c	2016-08-25 09:49:51.454720951 +0200
+@@ -1974,6 +1974,8 @@ int main (int argc, char **argv)
+ 	is_shadow_grp = sgr_file_present ();
+ #endif
+ 
++	get_defaults ();
++
+ 	process_flags (argc, argv);
+ 
+ #ifdef ENABLE_SUBIDS
+@@ -1983,8 +1985,6 @@ int main (int argc, char **argv)
+ 	    (!user_id || (user_id <= uid_max && user_id >= uid_min));
+ #endif				/* ENABLE_SUBIDS */
+ 
+-	get_defaults ();
+-
+ #ifdef ACCT_TOOLS_SETUID
+ #ifdef USE_PAM
+ 	{
diff --git a/shadow-utils.spec b/shadow-utils.spec
index a42dc34..d748e24 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: https://github.com/shadow-maint/shadow/archive/%{version}.tar.gz#/shadow-%{version}.tar.gz
@@ -34,6 +34,7 @@ Patch24: shadow-4.2.1-no-lock-dos.patch
 Patch25: shadow-4.3.1-defs-chroot.patch
 Patch28: shadow-4.3.1-selinux-perms.patch
 Patch29: shadow-4.2.1-null-tm.patch
+Patch30: shadow-4.3.1-process-defaults.patch
 
 License: BSD and GPLv2+
 Group: System Environment/Base
@@ -89,6 +90,7 @@ are used for managing group accounts.
 %patch25 -p1 -b .defs-chroot
 %patch28 -p1 -b .selinux-perms
 %patch29 -p1 -b .null-tm
+%patch30 -p1 -b .process-defaults
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -247,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Thu Aug 25 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.3.1-2
+- fix regression in useradd - not processing defaults properly (#1369979)
+
 * Tue Aug 23 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.3.1-1
 - new upstream release fixing low impact security issue