X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/cbe2d68fd7c7c7bac692b3a2d200a5d2429ab201..9a6ebcc92bba00a39a1f54c7c4c7b6dcf8dfd972:/rlogin.c?ds=sidebyside

diff --git a/rlogin.c b/rlogin.c
index 455c2d9d..06c8b12b 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -39,6 +39,7 @@ static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
     if (rlogin->s) {
         sk_close(rlogin->s);
         rlogin->s = NULL;
+	notify_remote_exit(rlogin->frontend);
     }
     if (error_msg) {
 	/* A socket error has occurred. */
@@ -100,7 +101,7 @@ static void rlogin_sent(Plug plug, int bufsize)
 static const char *rlogin_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 = {
 	rlogin_closing,
@@ -130,8 +131,10 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle,
 	sfree(buf);
     }
     addr = name_lookup(host, port, realhost, cfg);
-    if ((err = sk_addr_error(addr)) != NULL)
+    if ((err = sk_addr_error(addr)) != NULL) {
+	sk_addr_free(addr);
 	return err;
+    }
 
     if (port < 0)
 	port = 513;		       /* default rlogin port */
@@ -147,12 +150,10 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle,
 	sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
-			       nodelay, (Plug) rlogin, cfg);
+			       nodelay, keepalive, (Plug) rlogin, cfg);
     if ((err = sk_socket_error(rlogin->s)) != NULL)
 	return err;
 
-    sk_addr_free(addr);
-
     /*
      * Send local username, remote username, terminal/speed
      */