From: Sam Leonard <sam.leonard@codethink.co.uk>
Date: Thu, 7 Mar 2024 14:43:28 +0000 (+0000)
Subject: ssh-generator: support ssh.ephemeral-key.all-users
X-Git-Tag: v256-rc1~439^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=071155a1fbac;p=thirdparty%2Fsystemd.git

ssh-generator: support ssh.ephemeral-key.all-users
---

diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index 08532690a9c..4f0a4b0d520 100644
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -108,8 +108,9 @@ static int make_sshd_template_unit(
                         "Description=OpenSSH Per-Connection Server Daemon\n"
                         "Documentation=man:systemd-ssh-generator(8) man:sshd(8)\n"
                         "[Service]\n"
-                        "ExecStart=-%s -i\n"
-                        "StandardInput=socket",
+                        "ExecStart=-%s -i -o \"AuthorizedKeysFile ${CREDENTIALS_DIRECTORY}/ssh.ephemeral-authorized_keys-all .ssh/authorized_keys\"\n"
+                        "StandardInput=socket\n"
+                        "ImportCredential=ssh.ephemeral-authorized_keys-all",
                         sshd_binary);
 
                 r = fflush_and_check(f);