Blame SOURCES/shadow-4.6-goodname.patch

0a22bc
diff -up shadow-4.6/libmisc/chkname.c.goodname shadow-4.6/libmisc/chkname.c
0a22bc
--- shadow-4.6/libmisc/chkname.c.goodname	2020-10-23 12:50:47.202529031 +0200
0a22bc
+++ shadow-4.6/libmisc/chkname.c	2020-10-23 12:54:54.604692559 +0200
0a22bc
@@ -49,25 +49,44 @@
5ab9c0
 static bool is_valid_name (const char *name)
0a22bc
 {
5ab9c0
 	/*
5ab9c0
-	 * User/group names must match [a-z_][a-z0-9_-]*[$]
5ab9c0
-	 */
5ab9c0
-	if (('\0' == *name) ||
5ab9c0
-	    !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
5ab9c0
+         * User/group names must match gnu e-regex:
5ab9c0
+         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
5ab9c0
+         *
5ab9c0
+         * as a non-POSIX, extension, allow "$" as the last char for
5ab9c0
+         * sake of Samba 3.x "add machine script"
5ab9c0
+         *
5ab9c0
+         * Also do not allow fully numeric names or just "." or "..".
5ab9c0
+         */
5ab9c0
+	int numeric;
5ab9c0
+
5ab9c0
+	if ('\0' == *name ||
5ab9c0
+	    ('.' == *name && (('.' == name[1] && '\0' == name[2]) ||
5ab9c0
+			      '\0' == name[1])) ||
5ab9c0
+	    !((*name >= 'a' && *name <= 'z') ||
5ab9c0
+	      (*name >= 'A' && *name <= 'Z') ||
5ab9c0
+	      (*name >= '0' && *name <= '9') ||
5ab9c0
+	      *name == '_' ||
5ab9c0
+	      *name == '.')) {
5ab9c0
 		return false;
5ab9c0
 	}
5ab9c0
 
5ab9c0
+	numeric = isdigit(*name);
5ab9c0
+
5ab9c0
 	while ('\0' != *++name) {
5ab9c0
-		if (!(( ('a' <= *name) && ('z' >= *name) ) ||
5ab9c0
-		      ( ('0' <= *name) && ('9' >= *name) ) ||
5ab9c0
-		      ('_' == *name) ||
5ab9c0
-		      ('-' == *name) ||
5ab9c0
-		      ( ('$' == *name) && ('\0' == *(name + 1)) )
5ab9c0
+		if (!((*name >= 'a' && *name <= 'z') ||
5ab9c0
+		      (*name >= 'A' && *name <= 'Z') ||
5ab9c0
+		      (*name >= '0' && *name <= '9') ||
5ab9c0
+		      *name == '_' ||
5ab9c0
+		      *name == '.' ||
5ab9c0
+		      *name == '-' ||
5ab9c0
+		      (*name == '$' && name[1] == '\0')
5ab9c0
 		     )) {
5ab9c0
 			return false;
5ab9c0
 		}
5ab9c0
+		numeric &= isdigit(*name);
5ab9c0
 	}
5ab9c0
 
5ab9c0
-	return true;
5ab9c0
+	return !numeric;
5ab9c0
 }
5ab9c0
 
5ab9c0
 bool is_valid_user_name (const char *name)
0a22bc
diff -up shadow-4.6/man/groupadd.8.xml.goodname shadow-4.6/man/groupadd.8.xml
0a22bc
--- shadow-4.6/man/groupadd.8.xml.goodname	2018-04-29 18:42:37.000000000 +0200
0a22bc
+++ shadow-4.6/man/groupadd.8.xml	2020-10-23 12:50:47.202529031 +0200
0a22bc
@@ -273,10 +273,14 @@
5ab9c0
    <refsect1 id='caveats'>
5ab9c0
      <title>CAVEATS</title>
5ab9c0
      <para>
5ab9c0
-       Groupnames must start with a lower case letter or an underscore,
5ab9c0
-       followed by lower case letters, digits, underscores, or dashes.
5ab9c0
-       They can end with a dollar sign.
5ab9c0
-       In regular expression terms: [a-z_][a-z0-9_-]*[$]?
0a22bc
+       Groupnames may begin with lower and upper case letters, digits,
0a22bc
+       underscores, or periods. They may continue with all the aforementioned
0a22bc
+       characters, or dashes. Finally, they can end with a dollar sign.
5ab9c0
+
0a22bc
+       Fully numeric groupnames and groupnames containing only . or .. are
0a22bc
+       disallowed.
5ab9c0
+
5ab9c0
+       In regular expression terms: [a-zA-Z0-9_.][a-zA-Z0-9_.-]*[$]?
5ab9c0
      </para>
5ab9c0
      <para>
5ab9c0
        Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
0a22bc
diff -up shadow-4.6/man/useradd.8.xml.goodname shadow-4.6/man/useradd.8.xml
0a22bc
--- shadow-4.6/man/useradd.8.xml.goodname	2018-04-29 18:42:37.000000000 +0200
0a22bc
+++ shadow-4.6/man/useradd.8.xml	2020-10-23 12:50:47.202529031 +0200
0a22bc
@@ -650,10 +650,16 @@
5ab9c0
     </para>
5ab9c0
 
5ab9c0
     <para>
5ab9c0
-      Usernames must start with a lower case letter or an underscore,
5ab9c0
-      followed by lower case letters, digits, underscores, or dashes.
5ab9c0
-      They can end with a dollar sign.
5ab9c0
-      In regular expression terms: [a-z_][a-z0-9_-]*[$]?
0a22bc
+      Usernames may begin with lower and upper case letters, digits,
0a22bc
+      underscores, or periods. They may continue with all the aforementioned
0a22bc
+      characters, or dashes. Finally, they can end with a dollar sign.
5ab9c0
+
0a22bc
+      Fully numeric usernames and usernames containing only . or .. are
0a22bc
+      disallowed. It is not recommended to use usernames beginning
5ab9c0
+      with . character as their home directories will be hidden in
5ab9c0
+      the <command>ls</command> output.
5ab9c0
+
5ab9c0
+      In regular expression terms: [a-zA-Z0-9_.][a-zA-Z0-9_.-]*[$]?
5ab9c0
     </para>
5ab9c0
     <para>
5ab9c0
       Usernames may only be up to 32 characters long.