diff options
| author | Damien Miller <djm@mindrot.org> | 2002-01-24 14:46:04 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-01-24 14:46:04 +0100 |
| commit | 414642b26f2ab3b55786ce23da10166aae026211 (patch) | |
| tree | 928da3eff1183b7305537b11d8fc20ccd6a3a39a /contrib/gnome-ssh-askpass.c | |
| parent | - (stevesk) Makefile.in: bug #61; delete commented line for now. (diff) | |
| download | openssh-414642b26f2ab3b55786ce23da10166aae026211.tar.xz openssh-414642b26f2ab3b55786ce23da10166aae026211.zip | |
- (djm) Don't grab Xserver by default. x11-ssh-askpass doesn't and grabbing
can cause deadlocks with kinput2
Diffstat (limited to '')
| -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 @@ * gnome-ssh-askpass before calling "ssh-add < /dev/null". * * There is only one run-time option: if you set the environment variable - * "GNOME_SSH_ASKPASS_NOGRAB=true" then gnome-ssh-askpass will not grab - * the X server. I have found this necessary to avoid server hangs with - * X input extensions (e.g. kinput2) enabled. - djm + * "GNOME_SSH_ASKPASS_GRAB_SERVER=true" then gnome-ssh-askpass will grab + * the X server. This may have some benefit to security if you don't trust + * your X server. We grab the keyboard and pointer anyway. */ /* @@ -71,7 +71,7 @@ passphrase_dialog(char *message) int result, i, grab_server; GtkWidget *dialog, *entry, *label; - grab_server = (getenv("GNOME_SSH_ASKPASS_NOGRAB") == NULL); + grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL); |