X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rlogin.c;h=d73f7f9f97b7349025f1c566672178f5c63b5b7c;hb=48eafd66aa274c32fc8169a0d36619663905c210;hp=faf3daf90515d9d7c079eedbfe8bf10469065dff;hpb=38b668648aa0f832600f964d7030879d37d9a302;p=PuTTY.git

diff --git a/rlogin.c b/rlogin.c
index faf3daf9..d73f7f9f 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -58,6 +58,7 @@ static void rlogin_log(Plug plug, int type, SockAddr addr, int port,
 	msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
 
     logevent(rlogin->frontend, msg);
+    sfree(msg);
 }
 
 static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
@@ -160,7 +161,7 @@ static void rlogin_startup(Rlogin rlogin, const char *ruser)
  */
 static const char *rlogin_init(void *frontend_handle, void **backend_handle,
 			       Conf *conf,
-			       char *host, int port, char **realhost,
+			       const char *host, int port, char **realhost,
 			       int nodelay, int keepalive)
 {
     static const struct plug_function_table fn_table = {
@@ -225,15 +226,10 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle,
 
 	sfree(*realhost);
 	*realhost = dupstr(loghost);
-	colon = strrchr(*realhost, ':');
-	if (colon) {
-	    /*
-	     * FIXME: if we ever update this aspect of ssh.c for
-	     * IPv6 literal management, this should change in line
-	     * with it.
-	     */
+
+	colon = host_strrchr(*realhost, ':');
+	if (colon)
 	    *colon++ = '\0';
-	}
     }
 
     /*
@@ -283,7 +279,7 @@ static void rlogin_reconfig(void *handle, Conf *conf)
 /*
  * Called to send data down the rlogin connection.
  */
-static int rlogin_send(void *handle, char *buf, int len)
+static int rlogin_send(void *handle, const char *buf, int len)
 {
     Rlogin rlogin = (Rlogin) handle;
 
@@ -429,6 +425,7 @@ Backend rlogin_backend = {
     rlogin_provide_logctx,
     rlogin_unthrottle,
     rlogin_cfg_info,
+    NULL /* test_for_upstream */,
     "rlogin",
     PROT_RLOGIN,
     513