- (djm) Don't grab Xserver by default. x11-ssh-askpass doesn't and grabbing

   can cause deadlocks with kinput2

2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e8508b5e4..9304075ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020125
+ - (djm) Don't grab Xserver by default. x11-ssh-askpass doesn't and grabbing
+   can cause deadlocks with kinput2
+
 20020124
  - (stevesk) Makefile.in: bug #61; delete commented line for now.
 
@@ -7390,4 +7394,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1794 2002/01/23 23:26:43 stevesk Exp $
+$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 @@
  * 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);