X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b9d7bcadee831e9b59fb785f2464a5fc1897bd1a..b7a189f38294c745ae4ea6efb55891c8196e275b:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 61f4afb8..2cc2a217 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -1,4 +1,3 @@
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -42,7 +41,7 @@ static int rlogin_closing(Plug plug, char *error_msg, int error_code,
     }
     if (error_msg) {
 	/* A socket error has occurred. */
-	logevent(error_msg);
+	logevent(rlogin->frontend, error_msg);
 	connection_fatal("%s", error_msg);
     }				       /* Otherwise, the remote side closed the connection normally. */
     return 0;
@@ -122,11 +121,12 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
      * Try to find host.
      */
     {
-	char buf[200];
-	sprintf(buf, "Looking up host \"%.170s\"", host);
-	logevent(buf);
+	char *buf;
+	buf = dupprintf("Looking up host \"%s\"", host);
+	logevent(rlogin->frontend, buf);
+	sfree(buf);
     }
-    addr = sk_namelookup(host, realhost);
+    addr = name_lookup(host, port, realhost);
     if ((err = sk_addr_error(addr)))
 	return err;
 
@@ -137,10 +137,11 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
      * Open socket.
      */
     {
-	char buf[200], addrbuf[100];
+	char *buf, addrbuf[100];
 	sk_getaddr(addr, addrbuf, 100);
-	sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
-	logevent(buf);
+	buf = dupprintf("Connecting to %s port %d", addrbuf, port);
+	logevent(rlogin->frontend, buf);
+	sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
 			       nodelay, (Plug) rlogin);
@@ -234,7 +235,7 @@ static Socket rlogin_socket(void *handle)
 
 static int rlogin_sendok(void *handle)
 {
-    Rlogin rlogin = (Rlogin) handle;
+    /* Rlogin rlogin = (Rlogin) handle; */
     return 1;
 }
 
@@ -246,7 +247,7 @@ static void rlogin_unthrottle(void *handle, int backlog)
 
 static int rlogin_ldisc(void *handle, int option)
 {
-    Rlogin rlogin = (Rlogin) handle;
+    /* Rlogin rlogin = (Rlogin) handle; */
     return 0;
 }
 
@@ -255,9 +256,14 @@ static void rlogin_provide_ldisc(void *handle, void *ldisc)
     /* This is a stub. */
 }
 
+static void rlogin_provide_logctx(void *handle, void *logctx)
+{
+    /* This is a stub. */
+}
+
 static int rlogin_exitcode(void *handle)
 {
-    Rlogin rlogin = (Rlogin) handle;
+    /* Rlogin rlogin = (Rlogin) handle; */
     /* If we ever implement RSH, we'll probably need to do this properly */
     return 0;
 }
@@ -273,6 +279,7 @@ Backend rlogin_backend = {
     rlogin_sendok,
     rlogin_ldisc,
     rlogin_provide_ldisc,
+    rlogin_provide_logctx,
     rlogin_unthrottle,
     1
 };