X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d0718310cebfcc7b26136d53cc63e1cca2060e5c..d74d141c2daed084c8a62c5dc5b88e801b81ee5a:/plink.c

diff --git a/plink.c b/plink.c
index 17b81550..4113a812 100644
--- a/plink.c
+++ b/plink.c
@@ -256,7 +256,7 @@ char *do_select(SOCKET skt, int startup)
 {
     int events;
     if (startup) {
-	events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE;
+	events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE | FD_ACCEPT;
     } else {
 	events = 0;
     }
@@ -289,6 +289,12 @@ int main(int argc, char **argv)
 
     sklist = NULL;
     skcount = sksize = 0;
+    /*
+     * Initialise port and protocol to sensible defaults. (These
+     * will be overridden by more or less anything.)
+     */
+    default_protocol = PROT_SSH;
+    default_port = 22;
 
     flags = FLAG_STDERR;
     /*
@@ -643,6 +649,9 @@ int main(int argc, char **argv)
 			connopen &= select_result(wp, (LPARAM) FD_OOB);
 		    if (things.lNetworkEvents & FD_WRITE)
 			connopen &= select_result(wp, (LPARAM) FD_WRITE);
+    		    if (things.lNetworkEvents & FD_ACCEPT)
+			connopen &= select_result(wp, (LPARAM) FD_ACCEPT);
+
 		}
 	    }
 	} else if (n == 1) {