From c53557d535a4a0f39b334321054e85a1c6be0034 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Wed, 19 Mar 2008 20:26:36 +0000 Subject: [PATCH] 407_adduser_disable_PUG_with-n was applied upstream. --- debian/changelog | 2 +- debian/patches/407_adduser_disable_PUG_with-n | 78 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 debian/patches/407_adduser_disable_PUG_with-n diff --git a/debian/changelog b/debian/changelog index 530d3f96..94878f8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low + debian/patches/496_login_init_session + debian/patches/408_passwd_check_arguments + debian/patches/412_lastlog_-u_numerical_range + + debian/patches/407_adduser_disable_PUG_with-n - Updated patches: + debian/patches/504_undef_USE_PAM.nolibpam $(LIBCRYPT) $(LIBSKEY) $(LIBMD) are no more included in libshadow.la. @@ -25,7 +26,6 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low + debian/patches/542_useradd-O_option + debian/patches/401_cppw_src.dpatch + debian/patches/428_grpck_add_prune_option - + debian/patches/407_adduser_disable_PUG_with-n * debian/watch: Add a watch file for shadow. -- Nicolas FRANCOIS (Nekral) Sun, 24 Feb 2008 18:33:31 +0100 diff --git a/debian/patches/407_adduser_disable_PUG_with-n b/debian/patches/407_adduser_disable_PUG_with-n deleted file mode 100644 index b71c2f3a..00000000 --- a/debian/patches/407_adduser_disable_PUG_with-n +++ /dev/null @@ -1,78 +0,0 @@ -Goal: Document the creation of primary user groups. - Add the -n option to disable this behavior. - -Fixes: #416835 - -Status wrt upstream: not reported yet. - -Notes: - * The nflg variable already existed, but was never set. - - * This could also be done by just specifying that the -g's argument is - optional. As -n is already implemented in RedHat, it may be better - for compatibility to keep it. - - * The debian/useradd.default file had to be updated to reflect these - changes. - -Index: shadow-4.1.0/man/useradd.8.xml -=================================================================== ---- shadow-4.1.0.orig/man/useradd.8.xml -+++ shadow-4.1.0/man/useradd.8.xml -@@ -157,8 +157,7 @@ - - The group name or number of the user's initial login group. The - group name must exist. A group number must refer to an already -- existing group. The default group number is 1 or whatever is -- specified in /etc/default/useradd. -+ existing group. - - - -@@ -207,6 +206,23 @@ - - - -+ -+ -+ -+ -+ A group having the same name as the user being added to the -+ system will be created by default (when is -+ not specified). This option will turn off this behavior. When -+ this option is used, users by default will be placed in -+ whatever group is specified in the -+ GROUP variable of -+ /etc/default/useradd. If no default group -+ is defined, group 100 (users) will be used. -+ -+ -+ -+ -+ - , - KEY=VALUE - -Index: shadow-4.1.0/src/useradd.c -=================================================================== ---- shadow-4.1.0.orig/src/useradd.c -+++ shadow-4.1.0/src/useradd.c -@@ -1025,7 +1025,7 @@ - {NULL, 0, NULL, '\0'} - }; - while ((c = -- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:lmMop:rs:u:", -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:lmMnop:rs:u:", - long_options, NULL)) != -1) { - switch (c) { - case 'b': -@@ -1163,6 +1163,9 @@ - case 'm': - mflg++; - break; -+ case 'n': -+ nflg++; -+ break; - case 'o': - oflg++; - break; diff --git a/debian/patches/series b/debian/patches/series index 1f20d281..8e2353a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,5 @@ 508_nologin_in_usr_sbin 505_useradd_recommend_adduser 406_vipw_resume_properly -407_adduser_disable_PUG_with-n 414_remove-unwise-advices 415_login_put-echoctl-back