diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-26 07:08:03 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-26 07:08:03 +0200 |
| commit | 9d074e16c7a9879d67c348c7b2d70b725adfbdfa (patch) | |
| tree | c4c8dc52508717b3b7aa7c988924a03aa6eb83d8 /gnu/home/services/ssh.scm | |
| parent | ca7e310f7ac32354b2e693e9a0f783320952a8fc (diff) | |
| parent | eeb71d778f149834015858467fbeeb1276d96d1d (diff) | |
| download | guix-9d074e16c7a9879d67c348c7b2d70b725adfbdfa.tar.gz guix-9d074e16c7a9879d67c348c7b2d70b725adfbdfa.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/home/services/ssh.scm')
| -rw-r--r-- | gnu/home/services/ssh.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/home/services/ssh.scm b/gnu/home/services/ssh.scm index ac72129b6c..34b1fe4658 100644 --- a/gnu/home/services/ssh.scm +++ b/gnu/home/services/ssh.scm @@ -203,6 +203,9 @@ first)))) (memq keyword ssh-match-keywords)))) +(define (serialize-match-criteria _ value) + (string-append "Match " value "\n")) + (define-maybe match-criteria) (define-configuration openssh-host @@ -214,7 +217,7 @@ top-level options.") (host-name maybe-string "Host name---e.g., @code{\"foo.example.org\"} or @code{\"192.168.1.2\"}.") - (match-criteria ;TODO implement stricter match-criteria rules + (match-criteria maybe-match-criteria "When specified, this string denotes the set of hosts to which the entry applies, superseding the @code{host-name} field. Its first element must be @@ -288,8 +291,7 @@ through before connecting to the server.") (G_ "define either 'name' or 'match-criteria', not both"))) (string-append "Host " (openssh-host-name config) "\n")) (if (maybe-value-set? (openssh-host-match-criteria config)) - (string-append - "Match " (string-join (openssh-host-match-criteria config) " ") "\n") + (serialize-match-criteria #t (openssh-host-match-criteria config)) (raise (formatted-message (G_ "define either 'name' or 'match-criteria' once"))))) |