diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/gnome-ssh-askpass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/gnome-ssh-askpass.c b/contrib/gnome-ssh-askpass.c index 31aec46b7..949b80781 100644 --- a/contrib/gnome-ssh-askpass.c +++ b/contrib/gnome-ssh-askpass.c | |||
@@ -28,9 +28,9 @@ | |||
28 | * gnome-ssh-askpass before calling "ssh-add < /dev/null". | 28 | * gnome-ssh-askpass before calling "ssh-add < /dev/null". |
29 | * | 29 | * |
30 | * There is only one run-time option: if you set the environment variable | 30 | * There is only one run-time option: if you set the environment variable |
31 | * "GNOME_SSH_ASKPASS_NOGRAB=true" then gnome-ssh-askpass will not grab | 31 | * "GNOME_SSH_ASKPASS_GRAB_SERVER=true" then gnome-ssh-askpass will grab |
32 | * the X server. I have found this necessary to avoid server hangs with | 32 | * the X server. This may have some benefit to security if you don't trust |
33 | * X input extensions (e.g. kinput2) enabled. - djm | 33 | * your X server. We grab the keyboard and pointer anyway. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | /* | 36 | /* |
@@ -71,7 +71,7 @@ passphrase_dialog(char *message) | |||
71 | int result, i, grab_server; | 71 | int result, i, grab_server; |
72 | GtkWidget *dialog, *entry, *label; | 72 | GtkWidget *dialog, *entry, *label; |
73 | 73 | ||
74 | grab_server = (getenv("GNOME_SSH_ASKPASS_NOGRAB") == NULL); | 74 | grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); |
75 | 75 | ||
76 | dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK, | 76 | dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK, |
77 | GNOME_STOCK_BUTTON_CANCEL, NULL); | 77 | GNOME_STOCK_BUTTON_CANCEL, NULL); |