X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f85e6f6edb2c9415bc10bd2015479d72ea8c5ae2..05bea829b8868f5db4ac048897e944ed05dfc457:/telnet.c

diff --git a/telnet.c b/telnet.c
index 2edae219..5b340488 100644
--- a/telnet.c
+++ b/telnet.c
@@ -518,8 +518,13 @@ static void process_subneg(Telnet telnet)
 	    b[n++] = IAC;
 	    b[n++] = SE;
 	    telnet->bufsize = sk_write(telnet->s, (char *)b, n);
-	    logbuf = dupprintf("client:\tSB %s IS %s", telopt(telnet->sb_opt),
-			       n == 6 ? "<nothing>" : "<stuff>");
+	    logbuf = dupprintf("client:\tSB %s IS %s%s%s%s",
+			       telopt(telnet->sb_opt),
+			       *telnet->cfg.username ? "USER=" : "",
+			       telnet->cfg.username,
+			       *telnet->cfg.username ? " " : "",
+			       n == 6 ? "<nothing>" :
+			       (*telnet->cfg.environmt ? "<stuff>" : ""));
 	    logevent(telnet->frontend, logbuf);
 	    sfree(logbuf);
 	}
@@ -674,7 +679,7 @@ static void telnet_sent(Plug plug, int bufsize)
 static const char *telnet_init(void *frontend_handle, void **backend_handle,
 			       Config *cfg,
 			       char *host, int port, char **realhost,
-			       int nodelay)
+			       int nodelay, int keepalive)
 {
     static const struct plug_function_table fn_table = {
 	telnet_closing,
@@ -729,7 +734,7 @@ static const char *telnet_init(void *frontend_handle, void **backend_handle,
 	sfree(buf);
     }
     telnet->s = new_connection(addr, *realhost, port, 0, 1,
-			       nodelay, (Plug) telnet, &telnet->cfg);
+			       nodelay, keepalive, (Plug) telnet, &telnet->cfg);
     if ((err = sk_socket_error(telnet->s)) != NULL)
 	return err;