[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/14: home: services: ssh: Fix compilation warning with 'serialize-matc
From: |
guix-commits |
Subject: |
09/14: home: services: ssh: Fix compilation warning with 'serialize-match-criteria'. |
Date: |
Sun, 20 Aug 2023 17:22:26 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 613e913836f6a966b97f57fdad2c61aa20b067ca
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Fri Jul 21 22:08:07 2023 +0200
home: services: ssh: Fix compilation warning with
'serialize-match-criteria'.
* gnu/home/services/ssh.scm (serialize-match-criteria): New procedure.
(serialize-openssh-host): Use it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/home/services/ssh.scm | 8 +++++---
1 file 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")))))
- branch master updated (78748c619a -> a0f5885fef), guix-commits, 2023/08/20
- 02/14: services: dicod: Pre-build the GCIDE index., guix-commits, 2023/08/20
- 04/14: services: Define 'for-home'., guix-commits, 2023/08/20
- 01/14: services: dicod: Remove Shepherd < 0.9.0 compatibility layer., guix-commits, 2023/08/20
- 06/14: home: services: mcron: Define as a mapping of the system service., guix-commits, 2023/08/20
- 08/14: home: services: Add Syncthing., guix-commits, 2023/08/20
- 09/14: home: services: ssh: Fix compilation warning with 'serialize-match-criteria'.,
guix-commits <=
- 11/14: gnu: Add python-ffmpeg-python., guix-commits, 2023/08/20
- 13/14: gnu: lttng-ust: Update to 2.13.6., guix-commits, 2023/08/20
- 14/14: doc: Fix module for "Essential Home Services"., guix-commits, 2023/08/20
- 03/14: services: syncthing: Use 'match-record'., guix-commits, 2023/08/20
- 05/14: home: services: Support mapping of System services to Home services., guix-commits, 2023/08/20
- 07/14: home: services: Add dicod., guix-commits, 2023/08/20
- 10/14: gnu: Add bfs., guix-commits, 2023/08/20
- 12/14: gnu: Add r128gain., guix-commits, 2023/08/20