summaryrefslogtreecommitdiff
path: root/sys-apps/shadow/files/shadow-4.4-load_defaults.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/shadow/files/shadow-4.4-load_defaults.patch')
-rw-r--r--sys-apps/shadow/files/shadow-4.4-load_defaults.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/sys-apps/shadow/files/shadow-4.4-load_defaults.patch b/sys-apps/shadow/files/shadow-4.4-load_defaults.patch
deleted file mode 100644
index 4c0b84f68036..000000000000
--- a/sys-apps/shadow/files/shadow-4.4-load_defaults.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 507f96cdeb54079fb636c7ce21e371f7a16a520e Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Thu, 25 Aug 2016 11:20:34 +0200
-Subject: [PATCH] Fix regression in useradd not loading defaults properly.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The get_defaults() has to be called before processing the flags.
-
-Signed-off-by: Tomáš Mráz <tmraz@fedoraproject.org>
----
- src/useradd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/useradd.c b/src/useradd.c
-index fefa234..6c43e7e 100644
---- a/src/useradd.c
-+++ b/src/useradd.c
-@@ -2027,6 +2027,8 @@ int main (int argc, char **argv)
- is_shadow_grp = sgr_file_present ();
- #endif
-
-+ get_defaults ();
-+
- process_flags (argc, argv);
-
- #ifdef ENABLE_SUBIDS
-@@ -2036,8 +2038,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
- {