Attachment 12 Details for Bug 69 – Adds SSH_ALWAYS_ASKPASS env var and removes check for $DISPLAY

[patch] Adds SSH_ALWAYS_ASKPASS env var and removes check for $DISPLAY

askpass.diff (text/plain), 2.12 KB, created by Damien Miller on 2002-01-25 10:03:06 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2002-01-25 10:03:06 AEDT

Size: 2.12 KB

patch

obsolete

>Index: ssh.h
>===================================================================
>RCS file: /var/cvs/openssh/ssh.h,v
>retrieving revision 1.59
>diff -u -r1.59 ssh.h
>--- ssh.h	5 Jun 2001 20:32:22 -0000	1.59
>+++ ssh.h	24 Jan 2002 23:00:34 -0000
>@@ -82,6 +82,11 @@
> #define SSH_ASKPASS_ENV		"SSH_ASKPASS"
> 
> /*
>+ * Environment variable for forcing the use of askpass
>+ */
>+#define SSH_ALWAYS_ASKPASS_ENV	"SSH_ALWAYS_ASKPASS"
>+
>+/*
>  * Force host key length and server key length to differ by at least this
>  * many bits.  This is to make double encryption with rsaref work.
>  */
>Index: readpass.c
>===================================================================
>RCS file: /var/cvs/openssh/readpass.c,v
>retrieving revision 1.23
>diff -u -r1.23 readpass.c
>--- readpass.c	22 Jan 2002 12:24:52 -0000	1.23
>+++ readpass.c	24 Jan 2002 23:00:35 -0000
>@@ -119,7 +119,7 @@
> 			use_askpass = 1;
> 	}
> 
>-	if (use_askpass && getenv("DISPLAY")) {
>+	if (getenv(SSH_ALWAYS_ASKPASS_ENV) || use_askpass) {
> 		if (getenv(SSH_ASKPASS_ENV))
> 			askpass = getenv(SSH_ASKPASS_ENV);
> 		else
>Index: ssh.1
>===================================================================
>RCS file: /var/cvs/openssh/ssh.1,v
>retrieving revision 1.103
>diff -u -r1.103 ssh.1
>--- ssh.1	22 Jan 2002 12:32:27 -0000	1.103
>+++ ssh.1	24 Jan 2002 23:00:36 -0000
>@@ -1261,14 +1261,11 @@
> terminal if it was run from a terminal.
> If
> .Nm
>-does not have a terminal associated with it but
>-.Ev DISPLAY
>-and
>+does not have a terminal associated with and
> .Ev SSH_ASKPASS
> are set, it will execute the program specified by
> .Ev SSH_ASKPASS
>-and open an X11 window to read the passphrase.
>-This is particularly useful when calling
>+to read the passphrase. This is particularly useful when calling
> .Nm
> from a
> .Pa .Xsession
>@@ -1277,6 +1274,14 @@
> may be necessary to redirect the input from
> .Pa /dev/null
> to make this work.)
>+.It Ev SSH_ALWAYS_ASKPASS
>+If this environment variable is set, 
>+.Nm ssh 
>+will always request passwords via 
>+.Ev SSH_ASKPASS ,
>+regardless of whether 
>+.Nm ssh 
>+has a terminal associated with it.
> .It Ev SSH_AUTH_SOCK
> Identifies the path of a unix-domain socket used to communicate with the
> agent.

Actions: View | Diff

Attachments on bug 69: 12 | 722 | 1599 | 3347