me
/
guix
Archived
1
0
Fork 0
Code

services: openssh: Fix computation of the authorized-key directory. 

Fixes a bug introduced in 1f29ed4a81,
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.
master
Ludovic Courtès 2022-05-26 16:38:51 +02:00
parent 2b8d715da5
commit 0dc63ce519
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/services/ssh.scm
View File

@ -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