Attempt to fix the remaining key re-exchange bug

[PuTTY_svn.git] / telnet.c

diff --git a/telnet.c b/telnet.c
index cd70d9b8a06e6e8373dc8341df231ca6834f0ead..65953421169b785a09e25ae7b0faa853c1316892 100644 (file)
--- a/telnet.c
+++ b/telnet.c
@@ -174,7 +174,7 @@ static void deactivate_option (struct Opt *o) {
 static void option_side_effects(struct Opt *o, int enabled) {
     if (o->option == TELOPT_ECHO && o->send == DO)
         echoing = !enabled;
-    else if (o->option = TELOPT_SGA && o->send == DO)
+    else if (o->option == TELOPT_SGA && o->send == DO)
         editing = !enabled;
     ldisc_send(NULL, 0);               /* cause ldisc to notice the change */
 }
@@ -468,16 +468,17 @@ static void do_telnet_read (char *buf, int len) {
 static int telnet_receive(Socket skt, int urgent, char *data, int len) {
     if (urgent==3) {
         /* A socket error has occurred. */
+        sk_close(s);
         s = NULL;
         connection_fatal(data);
-        len = 0;
-    }
-    if (!len) {
+        return 0;
+    } else if (!len) {
        /* Connection has closed. */
        sk_close(s);
        s = NULL;
        return 0;
     }
+    if(urgent) in_synch = TRUE;
     do_telnet_read (data, len);
     return 1;
 }
@@ -506,7 +507,7 @@ static char *telnet_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, telnet_receive);
+    s = sk_new(addr, port, 0, 1, telnet_receive);
     if ( (err = sk_socket_error(s)) )
        return err;