[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: services: openssh: Fix computation of the authori
From: |
guix-commits |
Subject: |
branch master updated: services: openssh: Fix computation of the authorized-key directory. |
Date: |
Thu, 26 May 2022 10:42:38 -0400 |
This is an automated email from the git hooks/post-receive script.
civodul pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 0dc63ce519 services: openssh: Fix computation of the authorized-key
directory.
0dc63ce519 is described below
commit 0dc63ce519c5f98b2186d1871176e2fac3a6926b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu May 26 16:38:51 2022 +0200
services: openssh: Fix computation of the authorized-key directory.
Fixes a bug introduced in 1f29ed4a812f86c45e2d9c37fd9f80f6d0418293,
whereby 'authorized-key-directory' would end up creating empty files for
authorized keys passed as an extension.
See <https://issues.guix.gnu.org/55359>.
* gnu/services/ssh.scm (extend-openssh-authorized-keys): Call
'alist->vhash' on the alist resulting from the 'append' call.
---
gnu/services/ssh.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 95646ac033..aa024599a1 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -572,10 +572,9 @@ of user-name/file-like tuples."
(inherit config)
(authorized-keys
(match (append (openssh-configuration-authorized-keys config) keys)
- (((users _ ...) ...)
+ ((and alist ((users _ ...) ...))
;; Build a user/key-list mapping.
- (let ((user-keys (alist->vhash
- (openssh-configuration-authorized-keys config))))
+ (let ((user-keys (alist->vhash alist)))
;; Coalesce the key lists associated with each user.
(map (lambda (user)
`(,user
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: services: openssh: Fix computation of the authorized-key directory.,
guix-commits <=