glibc: Update to 2.20

[people/ms/ipfire-3.x.git] / shadow-utils / patches / shadow-4.1.4.3-goodname.patch

diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c
--- shadow-4.1.4.2_orig/libmisc/chkname.c	2009-04-28 19:14:04.000000000 +0000
+++ shadow-4.1.4.2/libmisc/chkname.c	2009-08-03 18:47:59.000000000 +0000
@@ -49,21 +49,29 @@
 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)) )
-		     )) {
-			return false;
+		if (!(  (*name >= 'a' && *name <= 'z') ||
+			(*name >= 'A' && *name <= 'Z') ||
+			(*name >= '0' && *name <= '9') ||
+			(*name == '_') || (*name == '.') || (*name == '-') ||
+			(*name == '$' && *(name + 1) == '\0') 
+		)) {
+		return false;
 		}
 	}
 
diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8
--- shadow-4.1.4.2_orig/man/groupadd.8	2009-07-24 01:16:24.000000000 +0000
+++ shadow-4.1.4.2/man/groupadd.8	2009-08-03 18:51:10.000000000 +0000
@@ -153,9 +153,7 @@
 .RE
 .SH "CAVEATS"
 .PP
-Groupnames 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_\-]*[$]?
-.PP
-Groupnames may only be up to 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 -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8
--- shadow-4.1.4.2_orig/man/useradd.8	2009-07-24 01:16:44.000000000 +0000
+++ shadow-4.1.4.2/man/useradd.8	2009-08-03 18:51:52.000000000 +0000
@@ -405,8 +405,6 @@
 \fBuseradd\fR
 will deny the user account creation request\&.
 .PP
-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_\-]*[$]?
-.PP
 Usernames may only be up to 32 characters long\&.
 .SH "CONFIGURATION"
 .PP