summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-28 12:05:52 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-28 12:05:52 +0200
commit88e2ed0b5bf6f08f5a2d4d64b1fefdc7192b9aac (patch)
tree8ee489f943ba0d5c95f08aa20ae8e22940573d9d
parentae480f0b09aec815b64579bb1828ea935d8ee236 (diff)
downloadsystemd-88e2ed0b5bf6f08f5a2d4d64b1fefdc7192b9aac.tar.gz
shared/user-util: emit a warning on names with dots
-rw-r--r--src/basic/user-util.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index b1ab84c5f0..3b253bc264 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -645,13 +645,26 @@ bool valid_user_group_name_full(const char *u, bool strict) {
u[0] != '_')
return false;
- for (i = u+1; *i; i++)
- if (!((*i >= 'a' && *i <= 'z') ||
- (*i >= 'A' && *i <= 'Z') ||
- (*i >= '0' && *i <= '9') ||
- IN_SET(*i, '_', '-') ||
- (!strict && *i == '.')))
- return false;
+ bool warned = false;
+
+ for (i = u+1; *i; i++) {
+ if (((*i >= 'a' && *i <= 'z') ||
+ (*i >= 'A' && *i <= 'Z') ||
+ (*i >= '0' && *i <= '9') ||
+ IN_SET(*i, '_', '-')))
+ continue;
+
+ if (*i == '.' && !strict) {
+ if (!warned) {
+ log_warning("Bad user or group name \"%s\", accepting for compatibility.", u);
+ warned = true;
+ }
+
+ continue;
+ }
+
+ return false;
+ }
sz = sysconf(_SC_LOGIN_NAME_MAX);
assert_se(sz > 0);