4e43c817a1
- Split shadow-login_defs.patch hunks to its logical components
(bsc#1121197):
* shadow-login_defs-unused-by-pam.patch
* shadow-login_defs-comments.patch
* shadow-login_defs-util-linux.patch
* shadow-login_defs-suse.patch
* Move appropriate hunks to chkname-regex.patch and
encryption_method_nis.patch
* Remove GROUPADD_CMD that is not supported (bsc#1121197#c14).
- Split getdef-new-defs.patch hunks to its logical components
(bsc#1121197):
* encryption_method_nis.patch
* chkname-regex.patch
* shadow-util-linux.patch
Add support for login: ALWAYS_SET_PATH and LOGIN_PLAIN_PROMPT.
* useradd-script.patch, userdel-script.patch
* Remove duplicated definitions of MOTD_FILE and ENV_PATH.
- Add shadow-login_defs-unused-check.sh to allow verification of
login.defs variable usage (bsc#1121197).
- Add virtual symbols for login.defs compatibility (bsc#1121197).
OBS-URL: https://build.opensuse.org/request/show/700494
OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=63
105 lines
2.8 KiB
Diff
105 lines
2.8 KiB
Diff
Index: etc/login.defs
|
|
===================================================================
|
|
--- etc/login.defs.orig
|
|
+++ etc/login.defs
|
|
@@ -274,3 +274,11 @@ USERGROUPS_ENAB yes
|
|
# missing.
|
|
#
|
|
#FORCE_SHADOW yes
|
|
+
|
|
+#
|
|
+# User/group names must match the following regex expression.
|
|
+# The default is [A-Za-z_][A-Za-z0-9_.-]*[A-Za-z0-9_.$-]\?,
|
|
+# but be aware that the result could depend on the locale settings.
|
|
+#
|
|
+#CHARACTER_CLASS [A-Za-z_][A-Za-z0-9_.-]*[A-Za-z0-9_.$-]\?
|
|
+CHARACTER_CLASS [ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_][ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-]*[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.$-]\?
|
|
Index: lib/getdef.c
|
|
===================================================================
|
|
--- lib/getdef.c.orig
|
|
+++ lib/getdef.c
|
|
@@ -77,6 +77,7 @@ struct itemdef {
|
|
|
|
#define NUMDEFS (sizeof(def_table)/sizeof(def_table[0]))
|
|
static struct itemdef def_table[] = {
|
|
+ {"CHARACTER_CLASS", NULL},
|
|
{"CHFN_RESTRICT", NULL},
|
|
{"CONSOLE_GROUPS", NULL},
|
|
{"CONSOLE", NULL},
|
|
Index: libmisc/chkname.c
|
|
===================================================================
|
|
--- libmisc/chkname.c.orig
|
|
+++ libmisc/chkname.c
|
|
@@ -43,30 +43,57 @@
|
|
#ident "$Id$"
|
|
|
|
#include <ctype.h>
|
|
+#include <regex.h>
|
|
#include "defines.h"
|
|
#include "chkname.h"
|
|
+#include "getdef.h"
|
|
+#include <stdio.h>
|
|
|
|
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))) {
|
|
+ const char *class;
|
|
+ regex_t reg;
|
|
+ int result;
|
|
+ char *buf;
|
|
+
|
|
+ /* User/group names must match [A-Za-z_][A-Za-z0-9_-.]*[A-Za-z0-9_-.$]?.
|
|
+ This is the POSIX portable character class. The $ at the end is
|
|
+ needed for SAMBA. But user can also specify something else in
|
|
+ /etc/login.defs. */
|
|
+ class = getdef_str ("CHARACTER_CLASS");
|
|
+ if (!class)
|
|
+ class = "[a-z_][a-z0-9_.-]*[a-z0-9_.$-]\\?";
|
|
+
|
|
+ if (asprintf (&buf, "^%s$", class) < 0)
|
|
+ return -1;
|
|
+
|
|
+ memset (®, 0, sizeof (regex_t));
|
|
+ result = regcomp (®, buf, 0);
|
|
+ free (buf);
|
|
+
|
|
+ if (result) {
|
|
+ size_t length = regerror (result, ®, NULL, 0);
|
|
+ char *buffer = malloc (length);
|
|
+ if (buffer == NULL)
|
|
+ fputs ("running out of memory!\n", stderr);
|
|
+
|
|
+ /* else
|
|
+ {
|
|
+ regerror (result, ®, buffer, length);
|
|
+ fprintf (stderr, _("Can't compile regular expression: %s\n"),
|
|
+ buffer);
|
|
+ } */
|
|
+
|
|
+ regfree(®);
|
|
return false;
|
|
}
|
|
|
|
- while ('\0' != *++name) {
|
|
- if (!(( ('a' <= *name) && ('z' >= *name) ) ||
|
|
- ( ('0' <= *name) && ('9' >= *name) ) ||
|
|
- ('_' == *name) ||
|
|
- ('-' == *name) ||
|
|
- ( ('$' == *name) && ('\0' == *(name + 1)) )
|
|
- )) {
|
|
- return false;
|
|
- }
|
|
+ if (regexec (®, name, 0, NULL, 0) != 0) {
|
|
+ regfree(®);
|
|
+ return false;
|
|
}
|
|
|
|
+ regfree(®);
|
|
return true;
|
|
}
|
|
|