From eef74f912528764be3cb1925b8f72ad98f0d99c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 19 Aug 2022 15:49:16 +0200 Subject: sysusers: do not reject non-simplified paths for shell/home /home/zbyszek/src/systemd-work/testcase.conf:3: '//sbin//nologin' is not a valid login shell field. This isn't very useful. The usual argument holds: people use templates to construct config, so paths may have doubled slashes and similar. Let's simplify paths so that the value that is pushed to /etc/passwd is nice and clean. --- src/sysusers/sysusers.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/sysusers') diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 36d86fb6cb..4bb173da46 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -1573,6 +1573,8 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { return log_syntax(NULL, LOG_ERR, fname, line, r, "Failed to replace specifiers in '%s': %m", home); + path_simplify(resolved_home); + if (!valid_home(resolved_home)) return log_syntax(NULL, LOG_ERR, fname, line, SYNTHETIC_ERRNO(EINVAL), "'%s' is not a valid home directory field.", resolved_home); @@ -1588,6 +1590,8 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { return log_syntax(NULL, LOG_ERR, fname, line, r, "Failed to replace specifiers in '%s': %m", shell); + path_simplify(resolved_shell); + if (!valid_shell(resolved_shell)) return log_syntax(NULL, LOG_ERR, fname, line, SYNTHETIC_ERRNO(EINVAL), "'%s' is not a valid login shell field.", resolved_shell); -- cgit v1.2.1