summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-05-19 07:52:00 -0400
committerSven Eden <yamakuzure@gmx.net>2017-07-25 09:46:52 +0200
commitf014d825983d55ade9a6edf2cf46c4b20b636234 (patch)
tree1da4b58c587a1f9a963c8bf30ea697f8e3bf0292 /src
parentcadef8dcd75df1197e4d3834ac6b3260f93b7f68 (diff)
sd-login: fix querying machines when machined is not running
We should not leak the internal error from missing directory and treat that case the same as no machines.
Diffstat (limited to 'src')
-rw-r--r--src/libelogind/sd-login/sd-login.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libelogind/sd-login/sd-login.c b/src/libelogind/sd-login/sd-login.c
index 794136304..96d7e447a 100644
--- a/src/libelogind/sd-login/sd-login.c
+++ b/src/libelogind/sd-login/sd-login.c
@@ -910,6 +910,10 @@ _public_ int sd_get_machine_names(char ***machines) {
assert_return(machines, -EINVAL);
r = get_files_in_directory("/run/systemd/machines/", &l);
+ if (r == -ENOENT) {
+ *machines = NULL;
+ return 0;
+ }
if (r < 0)
return r;