tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

can cause deadlocks with kinput2
This commit is contained in:
Damien Miller 2002-01-25 00:46:04 +11:00
parent 020daf437b
commit 414642b26f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 20020124
- (stevesk) Makefile.in: bug #61; delete commented line for now. - (stevesk) Makefile.in: bug #61; delete commented line for now.
@ -7390,4 +7394,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

8
contrib/gnome-ssh-askpass.c
View File

@ -28,9 +28,9 @@
* gnome-ssh-askpass before calling "ssh-add < /dev/null". * gnome-ssh-askpass before calling "ssh-add < /dev/null".
* *
* There is only one run-time option: if you set the environment variable * 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 * "GNOME_SSH_ASKPASS_GRAB_SERVER=true" then gnome-ssh-askpass will grab
* the X server. I have found this necessary to avoid server hangs with * the X server. This may have some benefit to security if you don't trust
* X input extensions (e.g. kinput2) enabled. - djm * your X server. We grab the keyboard and pointer anyway.
*/ */
/* /*
@ -71,7 +71,7 @@ passphrase_dialog(char *message)
int result, i, grab_server; int result, i, grab_server;
GtkWidget *dialog, *entry, *label; 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, dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK,
GNOME_STOCK_BUTTON_CANCEL, NULL); GNOME_STOCK_BUTTON_CANCEL, NULL);