[bug#33267] [PATCH] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.

[bug#33267] [PATCH] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 83 bytes --]

Hi!

The following small issue caught my eye while I was reading the code.

Maxim


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ssh-Honor-the-SOCKET-NAME-argument-of-connect-to-rem.patch --]
[-- Type: text/x-patch, Size: 993 bytes --]

From dd6d3ee8bec3a99fd178a8efddfa417fbed72a66 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 5 Nov 2018 00:01:47 -0500
Subject: [PATCH] ssh: Honor the SOCKET-NAME argument of
 connect-to-remote-daemon.

* guix/ssh.scm (connect-to-remote-daemon): Pass the `socket-name' variable to
the `open-connection' call so that it is honored.
---
 guix/ssh.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/ssh.scm b/guix/ssh.scm
index da20d4d8d..25ec8295e 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -161,7 +161,7 @@ Throw an error on failure."
                                     "/var/guix/daemon-socket/socket"))
   "Connect to the remote build daemon listening on SOCKET-NAME over SESSION,
 an SSH session.  Return a <nix-server> object."
-  (open-connection #:port (remote-daemon-channel session)))
+  (open-connection #:port (remote-daemon-channel session socket-name)))
 
 
 (define (store-import-channel session)
-- 
2.19.0

[bug#33267] [PATCH] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.

[Ludovic Courtès]

Hi Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

>>From dd6d3ee8bec3a99fd178a8efddfa417fbed72a66 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Mon, 5 Nov 2018 00:01:47 -0500
> Subject: [PATCH] ssh: Honor the SOCKET-NAME argument of
>  connect-to-remote-daemon.
>
> * guix/ssh.scm (connect-to-remote-daemon): Pass the `socket-name' variable to
> the `open-connection' call so that it is honored.

Good catch!  LGTM.

Thanks,
Ludo’.

[bug#33267] [PATCH] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.

[Maxim Cournoyer]

ludo@gnu.org (Ludovic Courtès) writes:

[...]

>> * guix/ssh.scm (connect-to-remote-daemon): Pass the `socket-name' variable to
>> the `open-connection' call so that it is honored.
>
> Good catch!  LGTM.

Pushed as 2e4d83398. Thanks!

Maxim

bug#33267: [PATCH] ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon.

[Maxim Cournoyer]

Closing.