Control of 'addr' is now handed over to {platform_,}new_connection() and

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index c12a080..af3bd87 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -32,7 +32,7 @@ static void c_write(Rlogin rlogin, char *buf, int len)
     sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG);
 }
 
-static int rlogin_closing(Plug plug, char *error_msg, int error_code,
+static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
                          int calling_back)
 {
     Rlogin rlogin = (Rlogin) plug;
@@ -43,7 +43,7 @@ static int rlogin_closing(Plug plug, char *error_msg, int error_code,
     if (error_msg) {
        /* A socket error has occurred. */
        logevent(rlogin->frontend, error_msg);
-       connection_fatal("%s", error_msg);
+       connection_fatal(rlogin->frontend, "%s", error_msg);
     }                                 /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -97,9 +97,10 @@ 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(void *frontend_handle, void **backend_handle,
-                        Config *cfg,
-                        char *host, int port, char **realhost, int nodelay)
+static const char *rlogin_init(void *frontend_handle, void **backend_handle,
+                              Config *cfg,
+                              char *host, int port, char **realhost,
+                              int nodelay)
 {
     static const struct plug_function_table fn_table = {
        rlogin_closing,
@@ -107,7 +108,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        rlogin_sent
     };
     SockAddr addr;
-    char *err;
+    const char *err;
     Rlogin rlogin;
 
     rlogin = snew(struct rlogin_tag);
@@ -129,8 +130,10 @@ static 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 */
@@ -150,8 +153,6 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
     if ((err = sk_socket_error(rlogin->s)) != NULL)
        return err;
 
-    sk_addr_free(addr);
-
     /*
      * Send local username, remote username, terminal/speed
      */