summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog51
-rw-r--r--gnome-ssh-askpass.c3
2 files changed, 30 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 21d6358a4..840369f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,31 @@
119991122
2 - Make <enter> close gnome-ssh-askpass (Debian bug #50299)
3
119991121 419991121
2 - OpenBSD CVS Changes 5 - OpenBSD CVS Changes
3 - [channels.c] 6 - [channels.c]
4 make this compile, bad markus 7 make this compile, bad markus
5 - [log.c readconf.c servconf.c ssh.h] 8 - [log.c readconf.c servconf.c ssh.h]
6 bugfix: loglevels are per host in clientconfig, 9 bugfix: loglevels are per host in clientconfig,
7 factor out common log-level parsing code. 10 factor out common log-level parsing code.
8 - [servconf.c] 11 - [servconf.c]
9 remove unused index (-Wall) 12 remove unused index (-Wall)
10 - [ssh-agent.c] 13 - [ssh-agent.c]
11 only one 'extern char *__progname' 14 only one 'extern char *__progname'
12 - [sshd.8] 15 - [sshd.8]
13 document SIGHUP, -Q to synopsis 16 document SIGHUP, -Q to synopsis
14 - [sshconnect.c serverloop.c sshd.c packet.c packet.h] 17 - [sshconnect.c serverloop.c sshd.c packet.c packet.h]
15 [channels.c clientloop.c] 18 [channels.c clientloop.c]
16 SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@ 19 SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@
17 [hope this time my ISP stays alive during commit] 20 [hope this time my ISP stays alive during commit]
18 - [OVERVIEW README] typos; green@freebsd 21 - [OVERVIEW README] typos; green@freebsd
19 - [ssh-keygen.c] 22 - [ssh-keygen.c]
20 replace xstrdup+strcat with strlcat+fixed buffer, fixes OF (bad me) 23 replace xstrdup+strcat with strlcat+fixed buffer, fixes OF (bad me)
21 exit if writing the key fails (no infinit loop) 24 exit if writing the key fails (no infinit loop)
22 print usage() everytime we get bad options 25 print usage() everytime we get bad options
23 - [ssh-keygen.c] overflow, djm@mindrot.org 26 - [ssh-keygen.c] overflow, djm@mindrot.org
24 - [sshd.c] fix sigchld race; cjc5@po.cwru.edu 27 - [sshd.c] fix sigchld race; cjc5@po.cwru.edu
25 28
2619991120 2919991120
27 - Merged more Solaris support from Marc G. Fournier 30 - Merged more Solaris support from Marc G. Fournier
28 <marc.fournier@acadiau.ca> 31 <marc.fournier@acadiau.ca>
diff --git a/gnome-ssh-askpass.c b/gnome-ssh-askpass.c
index 749560992..93a64d1e1 100644
--- a/gnome-ssh-askpass.c
+++ b/gnome-ssh-askpass.c
@@ -74,6 +74,9 @@ int passphrase_dialog(char **passphrase_p, char *message)
74 gdk_pointer_grab(dialog->window, TRUE, 0, NULL, NULL, GDK_CURRENT_TIME); 74 gdk_pointer_grab(dialog->window, TRUE, 0, NULL, NULL, GDK_CURRENT_TIME);
75 gdk_keyboard_grab(dialog->window, FALSE, GDK_CURRENT_TIME); 75 gdk_keyboard_grab(dialog->window, FALSE, GDK_CURRENT_TIME);
76 76
77 /* Make <enter> close dialog */
78 gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry));
79
77 /* Run dialog */ 80 /* Run dialog */
78 result = gnome_dialog_run(GNOME_DIALOG(dialog)); 81 result = gnome_dialog_run(GNOME_DIALOG(dialog));
79 82