summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-12-15 21:14:01 +0100
committerGitHub <noreply@github.com>2020-12-15 21:14:01 +0100
commit94b78105c6f93dfe17b4353356227a0baf86f1fe (patch)
tree7c51f75a12b78a4641ade43a621bfa813aa404a6 /src/journal
parent6fe2a70b9160e35fdeed9d37bd31727c2d46a8b2 (diff)
parent1ecb46724cae151606bc825f0e39f14d4dfe1a0e (diff)
downloadsystemd-94b78105c6f93dfe17b4353356227a0baf86f1fe.tar.gz
Merge pull request #17967 from poettering/connect-user-bus
add support for "systemctl --user --machine=foobar@.host" for connecting to user bus of user "foobar"
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/sd-journal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 624fc5fab5..27251a2597 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1984,7 +1984,7 @@ _public_ int sd_journal_open_container(sd_journal **ret, const char *machine, in
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return((flags & ~OPEN_CONTAINER_ALLOWED_FLAGS) == 0, -EINVAL);
- assert_return(machine_name_is_valid(machine), -EINVAL);
+ assert_return(hostname_is_valid(machine, 0), -EINVAL);
p = strjoina("/run/systemd/machines/", machine);
r = parse_env_file(NULL, p,