69 lines
2.9 KiB
Diff
69 lines
2.9 KiB
Diff
diff -up shadow-4.1.3/libmisc/chkname.c.goodname shadow-4.1.3/libmisc/chkname.c
|
|
--- shadow-4.1.3/libmisc/chkname.c.goodname 2008-12-23 23:42:21.000000000 +0100
|
|
+++ shadow-4.1.3/libmisc/chkname.c 2009-04-14 11:46:21.000000000 +0200
|
|
@@ -54,20 +54,28 @@
|
|
static bool is_valid_name (const char *name)
|
|
{
|
|
/*
|
|
- * User/group names must match [a-z_][a-z0-9_-]*[$]
|
|
- */
|
|
- if (('\0' == *name) ||
|
|
- !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
|
|
+ * User/group names must match gnu e-regex:
|
|
+ * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
|
|
+ *
|
|
+ * as a non-POSIX, extension, allow "$" as the last char for
|
|
+ * sake of Samba 3.x "add machine script"
|
|
+ */
|
|
+ if ( ('\0' == *name) ||
|
|
+ !((*name >= 'a' && *name <= 'z') ||
|
|
+ (*name >= 'A' && *name <= 'Z') ||
|
|
+ (*name >= '0' && *name <= '9') ||
|
|
+ (*name == '_') || (*name == '.')
|
|
+ )) {
|
|
return false;
|
|
}
|
|
|
|
while ('\0' != *++name) {
|
|
- if (!(( ('a' <= *name) && ('z' >= *name) ) ||
|
|
- ( ('0' <= *name) && ('9' >= *name) ) ||
|
|
- ('_' == *name) ||
|
|
- ('-' == *name) ||
|
|
- ( ('$' == *name) && ('\0' == *(name + 1)) )
|
|
- )) {
|
|
+ if (!( (*name >= 'a' && *name <= 'z') ||
|
|
+ (*name >= 'A' && *name <= 'Z') ||
|
|
+ (*name >= '0' && *name <= '9') ||
|
|
+ (*name == '_') || (*name == '.') || (*name == '-') ||
|
|
+ (*name == '$' && *(name + 1) == '\0')
|
|
+ )) {
|
|
return false;
|
|
}
|
|
}
|
|
diff -up shadow-4.1.3/man/groupadd.8.goodname shadow-4.1.3/man/groupadd.8
|
|
--- shadow-4.1.3/man/groupadd.8.goodname 2009-04-12 04:46:15.000000000 +0200
|
|
+++ shadow-4.1.3/man/groupadd.8 2009-04-14 11:45:13.000000000 +0200
|
|
@@ -139,9 +139,7 @@ Shadow password suite configuration\&.
|
|
.RE
|
|
.SH "CAVEATS"
|
|
.PP
|
|
-Groupnames 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_\-]*[$]?
|
|
-.PP
|
|
-Groupnames may only be up to 16 characters long\&.
|
|
+Groupnames may only be up to 32 characters long\&.
|
|
.PP
|
|
You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&.
|
|
.PP
|
|
diff -up shadow-4.1.3/man/useradd.8.goodname shadow-4.1.3/man/useradd.8
|
|
--- shadow-4.1.3/man/useradd.8.goodname 2009-04-12 04:46:35.000000000 +0200
|
|
+++ shadow-4.1.3/man/useradd.8 2009-04-14 11:45:13.000000000 +0200
|
|
@@ -385,8 +385,6 @@ Similarly, if the username already exist
|
|
\fBuseradd\fR
|
|
will deny the user account creation request\&.
|
|
.PP
|
|
-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_\-]*[$]?
|
|
-.PP
|
|
Usernames may only be up to 32 characters long\&.
|
|
.SH "CONFIGURATION"
|
|
.PP
|