-diff -up shadow-4.1.5.1/libmisc/chkname.c.goodname shadow-4.1.5.1/libmisc/chkname.c
---- shadow-4.1.5.1/libmisc/chkname.c.goodname 2009-07-13 00:24:45.000000000 +0200
-+++ shadow-4.1.5.1/libmisc/chkname.c 2012-09-19 18:43:53.492160653 +0200
-@@ -49,20 +49,28 @@
- static bool is_valid_name (const char *name)
- {
+diff -urpa shadow-4.8.orig/libmisc/chkname.c shadow-4.8/libmisc/chkname.c
+--- shadow-4.8.orig/libmisc/chkname.c 2019-10-05 03:23:58.000000000 +0200
++++ shadow-4.8/libmisc/chkname.c 2019-12-15 23:50:06.137000000 +0100
+@@ -55,21 +55,28 @@ static bool is_valid_name (const char *n
+ }
+
/*
- * User/group names must match [a-z_][a-z0-9_-]*[$]
-- */
++ * 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) ||
- !((('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 == '.')
-+ )) {
++ !((*name >= 'a' && *name <= 'z') ||
++ (*name >= 'A' && *name <= 'Z') ||
++ (*name >= '0' && *name <= '9') ||
++ (*name == '_') || (*name == '.')
++ )) {
return false;
}
- ('-' == *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')
-+ )) {
++ 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.5.1/man/groupadd.8.xml.goodname shadow-4.1.5.1/man/groupadd.8.xml
---- shadow-4.1.5.1/man/groupadd.8.xml.goodname 2012-05-25 13:45:27.000000000 +0200
-+++ shadow-4.1.5.1/man/groupadd.8.xml 2012-09-19 18:43:53.492160653 +0200
-@@ -259,12 +259,6 @@
+diff -urpa shadow-4.8.orig/man/groupadd.8.xml shadow-4.8/man/groupadd.8.xml
+--- shadow-4.8.orig/man/groupadd.8.xml 2019-07-23 17:26:08.000000000 +0200
++++ shadow-4.8/man/groupadd.8.xml 2019-12-15 23:41:44.562000000 +0100
+@@ -273,12 +273,6 @@
<refsect1 id='caveats'>
<title>CAVEATS</title>
<para>
Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
</para>
<para>
-diff -up shadow-4.1.5.1/man/man8/groupadd.8.goodname shadow-4.1.5.1/man/man8/groupadd.8
---- shadow-4.1.5.1/man/man8/groupadd.8.goodname 2012-05-25 13:58:40.000000000 +0200
-+++ shadow-4.1.5.1/man/man8/groupadd.8 2012-09-19 18:44:42.175123079 +0200
-@@ -190,9 +190,7 @@ Shadow password suite configuration\&.
+diff -urpa shadow-4.8.orig/man/man8/groupadd.8 shadow-4.8/man/man8/groupadd.8
+--- shadow-4.8.orig/man/man8/groupadd.8 2019-12-01 18:45:34.000000000 +0100
++++ shadow-4.8/man/man8/groupadd.8 2019-12-15 23:41:44.563000000 +0100
+@@ -197,9 +197,7 @@ Shadow password suite configuration\&.
.RE
.SH "CAVEATS"
.PP
.PP
You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&.
.PP
-diff -up shadow-4.1.5.1/man/man8/useradd.8.goodname shadow-4.1.5.1/man/man8/useradd.8
---- shadow-4.1.5.1/man/man8/useradd.8.goodname 2012-05-25 13:59:28.000000000 +0200
-+++ shadow-4.1.5.1/man/man8/useradd.8 2012-09-19 18:46:09.249033949 +0200
-@@ -224,7 +224,7 @@ is not enabled, no home directories are
+diff -urpa shadow-4.8.orig/man/man8/useradd.8 shadow-4.8/man/man8/useradd.8
+--- shadow-4.8.orig/man/man8/useradd.8 2019-12-01 18:45:38.000000000 +0100
++++ shadow-4.8/man/man8/useradd.8 2019-12-15 23:41:44.563000000 +0100
+@@ -226,7 +226,7 @@ is not enabled, no home directories are
.PP
- \fB\-M\fR
+ \fB\-M\fR, \fB\-\-no\-create\-home\fR
.RS 4
-Do no create the user\*(Aqs home directory, even if the system wide setting from
+Do not create the user\*(Aqs home directory, even if the system wide setting from
/etc/login\&.defs
(\fBCREATE_HOME\fR) is set to
\fIyes\fR\&.
-@@ -430,8 +430,6 @@ Similarly, if the username already exist
+@@ -440,8 +440,6 @@ Similarly, if the username already exist
\fBuseradd\fR
will deny the user account creation request\&.
.PP
Usernames may only be up to 32 characters long\&.
.SH "CONFIGURATION"
.PP
-diff -up shadow-4.1.5.1/man/useradd.8.xml.goodname shadow-4.1.5.1/man/useradd.8.xml
---- shadow-4.1.5.1/man/useradd.8.xml.goodname 2012-05-25 13:45:29.000000000 +0200
-+++ shadow-4.1.5.1/man/useradd.8.xml 2012-09-19 18:43:53.493160675 +0200
+diff -urpa shadow-4.8.orig/man/useradd.8.xml shadow-4.8/man/useradd.8.xml
+--- shadow-4.8.orig/man/useradd.8.xml 2019-10-05 03:23:58.000000000 +0200
++++ shadow-4.8/man/useradd.8.xml 2019-12-15 23:41:44.563000000 +0100
@@ -366,7 +366,7 @@
</term>
<listitem>
wide setting from <filename>/etc/login.defs</filename>
(<option>CREATE_HOME</option>) is set to
<replaceable>yes</replaceable>.
-@@ -654,12 +654,6 @@
+@@ -661,12 +661,6 @@
</para>
<para>