[Pkg-shadow-commits] r1056 - in trunk/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-07-31 22:27:56 +0000 (Mon, 31 Jul 2006)
New Revision: 1056

Modified:
   trunk/debian/changelog
   trunk/debian/patches/506_relaxed_usernames
Log:
Fixe the regular expression and close #377844


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-31 22:26:25 UTC (rev 1055)
+++ trunk/debian/changelog	2006-07-31 22:27:56 UTC (rev 1056)
@@ -4,6 +4,8 @@
   * Debian packaging fixes:
     - login.defs: do not mention GETPASS_ASTERISKS since it is no more used.
       Thanks to Mike Frysinger for noticing it.
+    - 506_relaxed_usernames: Fix the regular expression of the accepted user
+      name in the useradd man page. Closes: #377844
   * Upstream bugs or fixes fixed in upstream releases or CVS:
     - 301_usermod_fix_-a: Fix the usermod's -a option. It should not take an
       argument, -a it uses the -G argument. Closes: #380645

Modified: trunk/debian/patches/506_relaxed_usernames
===================================================================
--- trunk/debian/patches/506_relaxed_usernames	2006-07-31 22:26:25 UTC (rev 1055)
+++ trunk/debian/patches/506_relaxed_usernames	2006-07-31 22:27:56 UTC (rev 1056)
@@ -6,6 +6,7 @@
  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
+ Also closes: #377844
  
  Comments from Karl Ramm (shadow 1:4.0.3-9, 20 Aug 2003 02:06:50 -0400):
  
@@ -65,7 +66,7 @@
 +      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_-]*[$]?$
++      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').