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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-04-28 16:56:22 +0000 (Fri, 28 Apr 2006)
New Revision: 966

Modified:
   trunk/debian/changelog
   trunk/debian/patches/406_good_name.dpatch
Log:
Fix the description of the allowed usernames in Debian's useradd(8).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-28 13:34:31 UTC (rev 965)
+++ trunk/debian/changelog	2006-04-28 16:56:22 UTC (rev 966)
@@ -4,6 +4,9 @@
   * Fix UNRELEASED in the NEWS.Debian file. Closes: #364752
   * Debconf translation updates:
     - Dutch translation updated. Closes: #363690
+  * Debian specific fixes:
+    - 406_good_name: Better description of what usernames are recommanded or
+      allowed in useradd(8).  Thanks to Reuben Thomas. Closes: #364909
   * Upstream bugs or fixes fixed in upstream releases or CVS:
     - 303_usermod_-a_in_man. Document -a in usermod man page. Closes: #365091
 

Modified: trunk/debian/patches/406_good_name.dpatch
===================================================================
--- trunk/debian/patches/406_good_name.dpatch	2006-04-28 13:34:31 UTC (rev 965)
+++ trunk/debian/patches/406_good_name.dpatch	2006-04-28 16:56:22 UTC (rev 966)
@@ -82,13 +82,13 @@
 -      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_-]*[$]
-+      On Debian, the constraints on the username are lowered:
-+      Usernames must neither start by a dash ('-') nor contain a colon (':') or
-+      an end of line ('\n').
-+      However, it is usually recommended to only use usernames that begin with
++      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, underscores, dashes, and dollar signs. In regular
-+      expression terms: [a-z_][a-z0-9_-]*[$]
++      case letters, digits, underscores, dashes, and optionally terminated by
++      a dollar sign. In regular expression terms: ^[a-z_][a-z0-9_-]*[$]?$
++      On Debian, the constraints on the username are loosened:
++      Usernames must neither start by a dash ('-') nor contain a colon (':')
++      or an end of line ('\n').
      </para>
    </refsect1>