summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-03-08 23:13:00 +1100
committerDamien Miller <djm@mindrot.org>2004-03-08 23:13:00 +1100
commit3b51301a4b30fbb421397f2cb3bcf11b593b2532 (patch)
tree8eebace6486d05c29fca7126c9bfd0028ccdf944
parentbd394c329b2356cc29fe76cc02ff1c63d3e8cd3c (diff)
- djm@cvs.openbsd.org 2004/03/08 09:38:05
[ssh-keyscan.c] explicitly initialise remote_major and remote_minor. from cjwatson AT debian.org; ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--ssh-keyscan.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f9ea2e95..6f180b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@
- markus@cvs.openbsd.org 2004/03/05 10:53:58
[readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c]
add IdentitiesOnly; ok djm@, pb@
+ - djm@cvs.openbsd.org 2004/03/08 09:38:05
+ [ssh-keyscan.c]
+ explicitly initialise remote_major and remote_minor.
+ from cjwatson AT debian.org; ok markus@
20040307
- (tim) [regress/login-timeout.sh] fix building outside of source tree.
@@ -883,4 +887,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3283 2004/03/08 12:12:36 djm Exp $
+$Id: ChangeLog,v 1.3284 2004/03/08 12:13:00 djm Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 68b6a0ad..266b23cb 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.46 2003/11/23 23:17:34 djm Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -489,7 +489,7 @@ conrecycle(int s)
static void
congreet(int s)
{
- int remote_major, remote_minor, n = 0;
+ int remote_major = 0, remote_minor = 0, n = 0;
char buf[256], *cp;
char remote_version[sizeof buf];
size_t bufsiz;