Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).

1 files changed, 2 insertions, 2 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 6fc624c63..770409b86 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;