diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-keyscan.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -23,6 +23,10 @@ | |||
23 | - markus@cvs.openbsd.org 2004/03/05 10:53:58 | 23 | - markus@cvs.openbsd.org 2004/03/05 10:53:58 |
24 | [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c] | 24 | [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c] |
25 | add IdentitiesOnly; ok djm@, pb@ | 25 | add IdentitiesOnly; ok djm@, pb@ |
26 | - djm@cvs.openbsd.org 2004/03/08 09:38:05 | ||
27 | [ssh-keyscan.c] | ||
28 | explicitly initialise remote_major and remote_minor. | ||
29 | from cjwatson AT debian.org; ok markus@ | ||
26 | 30 | ||
27 | 20040307 | 31 | 20040307 |
28 | - (tim) [regress/login-timeout.sh] fix building outside of source tree. | 32 | - (tim) [regress/login-timeout.sh] fix building outside of source tree. |
@@ -883,4 +887,4 @@ | |||
883 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 887 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
884 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 888 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
885 | 889 | ||
886 | $Id: ChangeLog,v 1.3283 2004/03/08 12:12:36 djm Exp $ | 890 | $Id: ChangeLog,v 1.3284 2004/03/08 12:13:00 djm Exp $ |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 68b6a0ad1..266b23cb3 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.46 2003/11/23 23:17:34 djm Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $"); |
11 | 11 | ||
12 | #include "openbsd-compat/sys-queue.h" | 12 | #include "openbsd-compat/sys-queue.h" |
13 | 13 | ||
@@ -489,7 +489,7 @@ conrecycle(int s) | |||
489 | static void | 489 | static void |
490 | congreet(int s) | 490 | congreet(int s) |
491 | { | 491 | { |
492 | int remote_major, remote_minor, n = 0; | 492 | int remote_major = 0, remote_minor = 0, n = 0; |
493 | char buf[256], *cp; | 493 | char buf[256], *cp; |
494 | char remote_version[sizeof buf]; | 494 | char remote_version[sizeof buf]; |
495 | size_t bufsiz; | 495 | size_t bufsiz; |