summaryrefslogtreecommitdiffstats
path: root/src/machine
diff options
context:
space:
mode:
authorIvan Kruglov <mail@ikruglov.com>2024-09-24 10:21:46 +0200
committerIvan Kruglov <mail@ikruglov.com>2024-10-07 14:50:16 +0200
commit144128d317029e6890694cc327aa6416b81ae64b (patch)
tree58ab7ca7a0bdd5198088f10ff3bf7223394c7512 /src/machine
parentmachine: use JSON_BUILD_PAIR_STRING_NON_EMPTY() in io.systemd.Machine.List ou... (diff)
downloadsystemd-144128d317029e6890694cc327aa6416b81ae64b.tar.xz
systemd-144128d317029e6890694cc327aa6416b81ae64b.zip
machine: extend io.systemd.Machine.List output with sshPrivateKeyPath field
Effectivelly, this is an implementation of GetMachineSSHInfo in dbus.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machined-varlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index 6011780b6f..6100024174 100644
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -406,7 +406,8 @@ static int list_machine_one(sd_varlink *link, Machine *m, bool more) {
SD_JSON_BUILD_PAIR_CONDITION(pidref_is_set(&m->leader), "leader", SD_JSON_BUILD_UNSIGNED(m->leader.pid)),
SD_JSON_BUILD_PAIR_CONDITION(dual_timestamp_is_set(&m->timestamp), "timestamp", JSON_BUILD_DUAL_TIMESTAMP(&m->timestamp)),
SD_JSON_BUILD_PAIR_CONDITION(m->vsock_cid != VMADDR_CID_ANY, "vSockCid", SD_JSON_BUILD_UNSIGNED(m->vsock_cid)),
- JSON_BUILD_PAIR_STRING_NON_EMPTY("sshAddress", m->ssh_address));
+ JSON_BUILD_PAIR_STRING_NON_EMPTY("sshAddress", m->ssh_address),
+ JSON_BUILD_PAIR_STRING_NON_EMPTY("sshPrivateKeyPath", m->ssh_private_key_path));
if (r < 0)
return r;