[Pkg-shadow-commits] r989 - trunk/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2006-05-18 02:21:54 +0000 (Thu, 18 May 2006)
New Revision: 989

Added:
   trunk/debian/patches/506_relaxed_usernames
Removed:
   trunk/debian/patches/406_good_name.dpatch
Log:
And now advance again..:-)


Deleted: trunk/debian/patches/406_good_name.dpatch
===================================================================
--- trunk/debian/patches/406_good_name.dpatch	2006-05-18 02:19:16 UTC (rev 988)
+++ trunk/debian/patches/406_good_name.dpatch	2006-05-18 02:21:54 UTC (rev 989)
@@ -1,74 +0,0 @@
-Goal: Relaxed usernames/groupnames checking patch.
-
-Status wrt upstream: Debian specific. Not to be used upstream
-
-Details:
- Allows any non-empty user/grounames that don't contain ':' and '\n'
- characters and don't start with '-'. This patch is more restrictive
- than original Karl's version. closes: #264879
- 
- Comments from Karl Ramm (shadow 1:4.0.3-9, 20 Aug 2003 02:06:50 -0400):
- 
- I can't come up with a good justification as to why characters other
- than ':'s and '\0's should be disallowed in group and usernames (other
- than '-' as the leading character).  Thus, the maintenance tools don't
- anymore.  closes: #79682, #166798, #171179
-
-Index: shadow-4.0.15/libmisc/chkname.c
-===================================================================
---- shadow-4.0.15.orig/libmisc/chkname.c	2006-03-08 19:32:11.412980911 +0100
-+++ shadow-4.0.15/libmisc/chkname.c	2006-03-08 19:33:33.777296244 +0100
-@@ -17,6 +17,7 @@
- #endif
- static int good_name (const char *name)
- {
-+#if 0
- 	/*
- 	 * User/group names must match [a-z_][a-z0-9_-]*[$]
- 	 */
-@@ -30,6 +31,16 @@
- 		      (*name == '$' && *(name + 1) == '\0')))
- 			return 0;
- 	}
-+#endif
-+	/*
-+	 * Allow more relaxed user/group names in Debian -- ^[^-:\n][^:\n]*$
-+	 */
-+	if (!*name || *name == '-')
-+		return 0;
-+	do
-+		if (*name == ':' || *name == '\n')
-+			return 0;
-+	while (*++name);
- 
- 	return 1;
- }
-Index: shadow-4.0.15/man/useradd.8.xml
-===================================================================
---- shadow-4.0.15.orig/man/useradd.8.xml	2006-03-08 19:32:11.414980506 +0100
-+++ shadow-4.0.15/man/useradd.8.xml	2006-03-08 19:33:33.780295636 +0100
-@@ -174,6 +174,7 @@
- 	    valid in conjunction with the <option>-m</option> option. The
- 	    default is to not create the directory and to not copy any
- 	    files.
-+	    This option may not function correctly if the username has a / in it.
- 	  </para>
- 	</listitem>
-       </varlistentry>
-@@ -352,9 +353,13 @@
-     </para>
- 
-     <para>
--      Usernames must begin with a lower case letter or an underscore, and
--      only lower case letters, underscores, dashes, and dollar signs may
--      follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
-+      It is usually recommended to only use usernames that begin with
-+      a lower case letter or an underscore, and are only followed by lower
-+      case letters, digits, underscores, dashes, and optionally terminated by
-+      a dollar sign. In regular expression terms: ^[a-z_][a-z0-9_-]*[$]?$
-+      On Debian, the only constraints are that usernames must neither start with a
-+      dash ('-') nor contain a colon (':')
-+      or an end of line ('\n').
-     </para>
-   </refsect1>
- 

Copied: trunk/debian/patches/506_relaxed_usernames (from rev 986, trunk/debian/patches/406_good_name.dpatch)