Log file tinkering: copy Event Log entries into the SSH packet log,

[PuTTY.git] / telnet.c

diff --git a/telnet.c b/telnet.c
index 5e5fb24765b145d5560470ec8d33a6dd715829f3..8ce3cf4fb8fbb6e1e76ebf66344c4238eef67969 100644 (file)
--- a/telnet.c
+++ b/telnet.c
@@ -575,7 +575,8 @@ static int telnet_closing(Plug plug, char *error_msg, int error_code,
     }
     if (error_msg) {
        /* A socket error has occurred. */
-       connection_fatal(error_msg);
+       logevent(error_msg);
+       connection_fatal("%s", error_msg);
     }                                 /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -636,7 +637,7 @@ static char *telnet_init(char *host, int port, char **realhost, int nodelay)
        sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
        logevent(buf);
     }
-    s = sk_new(addr, port, 0, 1, nodelay, &fn_table_ptr);
+    s = new_connection(addr, *realhost, port, 0, 1, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
        return err;