X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cf293dd490ce2144daf986e11e27df11bcc0dd9b..247308b5cf8a51eba882abf13c5572ba8f83d0ea:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index cee653ac..2ef2d717 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -34,7 +34,8 @@ static int rlogin_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;
 }
@@ -68,7 +69,8 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
 	    }
 	    firstbyte = 0;
 	}
-	c_write(data, len);
+	if (len > 0)
+            c_write(data, len);
     }
     return 1;
 }
@@ -86,7 +88,7 @@ static void rlogin_sent(Plug plug, int bufsize)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *rlogin_init(char *host, int port, char **realhost)
+static char *rlogin_init(char *host, int port, char **realhost, int nodelay)
 {
     static struct plug_function_table fn_table = {
 	rlogin_closing,
@@ -121,7 +123,7 @@ static char *rlogin_init(char *host, int port, char **realhost)
 	sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
 	logevent(buf);
     }
-    s = sk_new(addr, port, 1, 0, &fn_table_ptr);
+    s = new_connection(addr, *realhost, port, 1, 0, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
 	return err;
 
@@ -217,6 +219,12 @@ static int rlogin_ldisc(int option)
     return 0;
 }
 
+static int rlogin_exitcode(void)
+{
+    /* If we ever implement RSH, we'll probably need to do this properly */
+    return 0;
+}
+
 Backend rlogin_backend = {
     rlogin_init,
     rlogin_send,
@@ -224,6 +232,7 @@ Backend rlogin_backend = {
     rlogin_size,
     rlogin_special,
     rlogin_socket,
+    rlogin_exitcode,
     rlogin_sendok,
     rlogin_ldisc,
     rlogin_unthrottle,