From 0aa4c3f0f90f22b566b3c1002ccdce5ab5fb4062 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 28 May 2025 22:30:39 +0200 Subject: [PATCH 1/2] ssh-generator: fix typo --- src/ssh-generator/ssh-generator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c index 4cfbd85763..a903fd5d08 100644 --- a/src/ssh-generator/ssh-generator.c +++ b/src/ssh-generator/ssh-generator.c @@ -459,7 +459,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late) strv_sort_uniq(arg_listen_extra); if (!arg_auto && strv_isempty(arg_listen_extra)) { - log_debug("Disabling SSH generator logic, because as it has been turned off explicitly."); + log_debug("Disabling SSH generator logic, because it has been turned off explicitly."); return 0; } From e72bd8dbc867dbd68fa48b22f258feeb7760caa6 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 28 May 2025 22:30:46 +0200 Subject: [PATCH 2/2] ssh-generator: add missing newline before [Service] and trailing NL to generated service --- src/ssh-generator/ssh-generator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c index a903fd5d08..eaa4dec764 100644 --- a/src/ssh-generator/ssh-generator.c +++ b/src/ssh-generator/ssh-generator.c @@ -111,10 +111,11 @@ static int make_sshd_template_unit( "[Unit]\n" "Description=OpenSSH Per-Connection Server Daemon\n" "Documentation=man:systemd-ssh-generator(8) man:sshd(8)\n" + "\n" "[Service]\n" "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", + "ImportCredential=ssh.ephemeral-authorized_keys-all\n", sshd_binary); r = fflush_and_check(f);