407_adduser_disable_PUG_with-n was applied upstream.

2008-03-19 20:26:36 +00:00
parent afce34ff40
commit c53557d535
3 changed files with 1 additions and 80 deletions
@@ -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) <nicolas.francois@centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100
@@ -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 @@
- 	  <para>
- 	    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 <filename>/etc/default/useradd</filename>.
-+	    existing group.
- 	  </para>
- 	</listitem>
-       </varlistentry>
-@@ -207,6 +206,23 @@
-       </varlistentry>
-       <varlistentry>
- 	<term>
-+	  <option>-n</option>
-+	</term>
-+	<listitem>
-+	  <para>
-+	    A group having the same name as the user being added to the
-+	    system will be created by default (when <option>-g</option> 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
-+	    <replaceable>GROUP</replaceable> variable of
-+	    <filename>/etc/default/useradd</filename>. If no default group
-+	    is defined, group 100 (users) will be used.
-+	  </para>
-+	</listitem>
-+      </varlistentry>
-+      <varlistentry>
-+	<term>
- 	  <option>-K</option>, <option>--key</option>
- 	  <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>
- 	</term>
-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;
@@ -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