guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/05: services: openssh: Change 'authorized-keys' accessor name.


From: guix-commits
Subject: 05/05: services: openssh: Change 'authorized-keys' accessor name.
Date: Thu, 10 Mar 2022 17:51:04 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 5397c18157f12e9127b5a9a59b0aa5a4eb058839
Author: Ludovic Court├Ęs <ludo@gnu.org>
AuthorDate: Thu Mar 10 23:45:06 2022 +0100

    services: openssh: Change 'authorized-keys' accessor name.
    
    * gnu/services/ssh.scm (<openssh-configuration>)[authorized-keys]:
    Rename accessor to 'openssh-configuration-authorized-keys'.
    (openssh-activation, extend-openssh-authorized-keys): Adjust
    accordingly.
---
 gnu/services/ssh.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 433a0e8f91..5c8fe4eef4 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -348,7 +348,7 @@ The other options should be self-descriptive."
                          (default ""))
 
   ;; list of user-name/file-like tuples
-  (authorized-keys       openssh-authorized-keys
+  (authorized-keys       openssh-configuration-authorized-keys
                          (default '()))
 
   ;; Boolean
@@ -396,7 +396,7 @@ The other options should be self-descriptive."
             (unless (= ENOENT (system-error-errno args))
               (apply throw args))))
         (copy-recursively #$(authorized-key-directory
-                             (openssh-authorized-keys config))
+                             (openssh-configuration-authorized-keys config))
                           "/etc/ssh/authorized_keys.d")
 
         (chmod "/etc/ssh/authorized_keys.d" #o555)
@@ -541,10 +541,11 @@ of user-name/file-like tuples."
   (openssh-configuration
    (inherit config)
    (authorized-keys
-    (match (openssh-authorized-keys config)
+    (match (openssh-configuration-authorized-keys config)
       (((users _ ...) ...)
        ;; Build a user/key-list mapping.
-       (let ((user-keys (alist->vhash (openssh-authorized-keys config))))
+       (let ((user-keys (alist->vhash
+                         (openssh-configuration-authorized-keys config))))
          ;; Coalesce the key lists associated with each user.
          (map (lambda (user)
                 `(,user



reply via email to

[Prev in Thread] Current Thread [Next in Thread]