import openssh-4.3p2-gsskex-20060223.patch

1 files changed, 16 insertions, 7 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 46f063687..6915102dd 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.55 2005/06/17 02:44:33 djm Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.57 2005/10/30 04:01:03 djm Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -499,12 +499,18 @@ congreet(int s)
         size_t bufsiz;
         con *c = &fdcon[s];
 
-        bufsiz = sizeof(buf);
-        cp = buf;
-        while (bufsiz-- && (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') {
-                if (*cp == '\r')
-                        *cp = '\n';
-                cp++;
+        for (;;) {
+                memset(buf, '\0', sizeof(buf));
+                bufsiz = sizeof(buf);
+                cp = buf;
+                while (bufsiz-- &&
+                    (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') {
+                        if (*cp == '\r')
+                                *cp = '\n';
+                        cp++;
+                }
+                if (n != 1 || strncmp(buf, "SSH-", 4) == 0)
+                        break;
         }
         if (n == 0) {
                 switch (errno) {
@@ -712,6 +718,9 @@ main(int argc, char **argv)
         seed_rng();
         TAILQ_INIT(&tq);
 
+        /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
+        sanitise_stdfd();
+
         if (argc <= 1)
                 usage();