diff mbox series

[bug#36404,v4,1/4] ssh: Add 'identity' keyword to 'open-ssh-session'.

Message ID 8736jotj5v.fsf_-_@sdf.lonestar.org
State Accepted
Headers show
Series Add 'guix deploy'. | expand

Commit Message

Jakob L. Kreuze July 2, 2019, 5:56 p.m. UTC 
* guix/ssh.scm (open-ssh-session): Add 'identity' keyword argument.
---
 guix/ssh.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Thompson, David July 5, 2019, 1:23 a.m. UTC | #1 
On Tue, Jul 2, 2019 at 1:56 PM Jakob L. Kreuze
<zerodaysfordays@sdf.lonestar.org> wrote:
>
> * guix/ssh.scm (open-ssh-session): Add 'identity' keyword argument.
> ---
>  guix/ssh.scm | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/guix/ssh.scm b/guix/ssh.scm
> index 9b9baf54e..9bf10b9a0 100644
> --- a/guix/ssh.scm
> +++ b/guix/ssh.scm
> @@ -57,12 +57,14 @@
>  (define %compression
>    "zlib@openssh.com,zlib")
>
> -(define* (open-ssh-session host #:key user port
> +(define* (open-ssh-session host #:key user port identity
>                             (compression %compression))
> -  "Open an SSH session for HOST and return it.  When USER and PORT are #f, use
> -default values or whatever '~/.ssh/config' specifies; otherwise use them.
> -Throw an error on failure."
> +  "Open an SSH session for HOST and return it.  IDENTITY specifies the path of

Replace "path" with "file name".  Lots of people use them
interchangeably, but GNU makes a clear distinction between the two
terms.

> +a private key to use for authenticating with the host.  When USER, PORT, or
> +IDENTITY are #f, use default values or whatever '~/.ssh/config' specifies;
> +otherwise use them.  Throw an error on failure."
>    (let ((session (make-session #:user user
> +                               #:identity identity
>                                 #:host host
>                                 #:port port
>                                 #:timeout 10       ;seconds
> --
> 2.22.0
diff mbox series

Patch

diff --git a/guix/ssh.scm b/guix/ssh.scm
index 9b9baf54e..9bf10b9a0 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -57,12 +57,14 @@ 
 (define %compression
   "zlib@openssh.com,zlib")
 
-(define* (open-ssh-session host #:key user port
+(define* (open-ssh-session host #:key user port identity
                            (compression %compression))
-  "Open an SSH session for HOST and return it.  When USER and PORT are #f, use
-default values or whatever '~/.ssh/config' specifies; otherwise use them.
-Throw an error on failure."
+  "Open an SSH session for HOST and return it.  IDENTITY specifies the path of
+a private key to use for authenticating with the host.  When USER, PORT, or
+IDENTITY are #f, use default values or whatever '~/.ssh/config' specifies;
+otherwise use them.  Throw an error on failure."
   (let ((session (make-session #:user user
+                               #:identity identity
                                #:host host
                                #:port port
                                #:timeout 10       ;seconds