From ad3a822529a5a153c3c1c31c7aa2f4e24fc9b201 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Thu, 13 Jun 2024 04:14:18 +0200 Subject: [PATCH] Rebase patch 502_debian_useradd_defaults --- ...aults => 502_debian_useradd_defaults.patch} | 18 +++++++++++------- debian/patches/series | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) rename debian/patches/{502_debian_useradd_defaults => 502_debian_useradd_defaults.patch} (73%) diff --git a/debian/patches/502_debian_useradd_defaults b/debian/patches/502_debian_useradd_defaults.patch similarity index 73% rename from debian/patches/502_debian_useradd_defaults rename to debian/patches/502_debian_useradd_defaults.patch index 6317ed6c..ec4e9c4f 100644 --- a/debian/patches/502_debian_useradd_defaults +++ b/debian/patches/502_debian_useradd_defaults.patch @@ -9,27 +9,31 @@ Bug: https://github.com/shadow-maint/shadow/issues/501 Bug-Debian: https://bugs.debian.org/1004710 Forwarded: not-needed ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -79,12 +79,12 @@ +Index: shadow/src/useradd.c +=================================================================== +--- shadow.orig/src/useradd.c ++++ shadow/src/useradd.c +@@ -90,14 +90,14 @@ static const char Prog[] = "useradd"; /* * These defaults are used if there is no defaults file. */ -static gid_t def_group = 1000; +static gid_t def_group = 100; + static const char *def_groups = ""; static const char *def_gname = "other"; static const char *def_home = "/home"; static const char *def_shell = "/bin/bash"; static const char *def_template = SKEL_DIR; + static const char *def_usrtemplate = USRSKELDIR; -static const char *def_create_mail_spool = "yes"; +static const char *def_create_mail_spool = "no"; static const char *def_log_init = "yes"; static long def_inactive = -1; -diff --git a/man/useradd.8.xml b/man/useradd.8.xml -index af02a23f..c7f95b47 100644 ---- a/man/useradd.8.xml -+++ b/man/useradd.8.xml +Index: shadow/man/useradd.8.xml +=================================================================== +--- shadow.orig/man/useradd.8.xml ++++ shadow/man/useradd.8.xml @@ -248,7 +248,7 @@ command line), useradd will set the primary group of the new user to the value specified by the diff --git a/debian/patches/series b/debian/patches/series index c091f937..28311bf5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,7 @@ 402_cppw_selinux.patch 463_login_delay_obeys_to_PAM.patch 501_commonio_group_shadow.patch -502_debian_useradd_defaults +502_debian_useradd_defaults.patch 503_shadowconfig.8 505_useradd_recommend_adduser 506_relaxed_usernames