diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-25 00:46:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-25 00:46:04 +1100 |
commit | 414642b26f2ab3b55786ce23da10166aae026211 (patch) | |
tree | 928da3eff1183b7305537b11d8fc20ccd6a3a39a | |
parent | 020daf437b97c4d55268353737861fac60e6a073 (diff) |
- (djm) Don't grab Xserver by default. x11-ssh-askpass doesn't and grabbing
can cause deadlocks with kinput2
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | contrib/gnome-ssh-askpass.c | 8 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20020125 | ||
2 | - (djm) Don't grab Xserver by default. x11-ssh-askpass doesn't and grabbing | ||
3 | can cause deadlocks with kinput2 | ||
4 | |||
1 | 20020124 | 5 | 20020124 |
2 | - (stevesk) Makefile.in: bug #61; delete commented line for now. | 6 | - (stevesk) Makefile.in: bug #61; delete commented line for now. |
3 | 7 | ||
@@ -7390,4 +7394,4 @@ | |||
7390 | - Wrote replacements for strlcpy and mkdtemp | 7394 | - Wrote replacements for strlcpy and mkdtemp |
7391 | - Released 1.0pre1 | 7395 | - Released 1.0pre1 |
7392 | 7396 | ||
7393 | $Id: ChangeLog,v 1.1794 2002/01/23 23:26:43 stevesk Exp $ | 7397 | $Id: ChangeLog,v 1.1795 2002/01/24 13:46:04 djm Exp $ |
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); |