Giant const-correctness patch of doom!

[PuTTY.git] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index f582f0c0d736171e6215e82c13c7b8d3a2993ff9..10cda463ed81cf8d2c796130c9c91a0899dd3dc6 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -161,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 = {
@@ -226,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';
-       }
     }
 
     /*
@@ -284,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;