1 diff -up shadow-4.1.4.1/libmisc/chkname.c.goodname shadow-4.1.4.1/libmisc/chkname.c
2 --- shadow-4.1.4.1/libmisc/chkname.c.goodname 2009-04-28 21:14:04.000000000 +0200
3 +++ shadow-4.1.4.1/libmisc/chkname.c 2009-06-16 13:47:08.000000000 +0200
5 static bool is_valid_name (const char *name)
8 - * User/group names must match [a-z_][a-z0-9_-]*[$]
10 - if (('\0' == *name) ||
11 - !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
12 + * User/group names must match gnu e-regex:
13 + * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
15 + * as a non-POSIX, extension, allow "$" as the last char for
16 + * sake of Samba 3.x "add machine script"
18 + if ( ('\0' == *name) ||
19 + !((*name >= 'a' && *name <= 'z') ||
20 + (*name >= 'A' && *name <= 'Z') ||
21 + (*name >= '0' && *name <= '9') ||
22 + (*name == '_') || (*name == '.')
27 while ('\0' != *++name) {
28 - if (!(( ('a' <= *name) && ('z' >= *name) ) ||
29 - ( ('0' <= *name) && ('9' >= *name) ) ||
32 - ( ('$' == *name) && ('\0' == *(name + 1)) )
34 + if (!( (*name >= 'a' && *name <= 'z') ||
35 + (*name >= 'A' && *name <= 'Z') ||
36 + (*name >= '0' && *name <= '9') ||
37 + (*name == '_') || (*name == '.') || (*name == '-') ||
38 + (*name == '$' && *(name + 1) == '\0')
43 diff -up shadow-4.1.4.1/man/useradd.8.goodname shadow-4.1.4.1/man/useradd.8
44 --- shadow-4.1.4.1/man/useradd.8.goodname 2009-05-22 15:56:28.000000000 +0200
45 +++ shadow-4.1.4.1/man/useradd.8 2009-06-16 13:51:17.000000000 +0200
46 @@ -405,8 +405,6 @@ Similarly, if the username already exist
48 will deny the user account creation request\&.
50 -Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes\&. They can end with a dollar sign\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]?
52 Usernames may only be up to 32 characters long\&.