Fix several bugs that stopped %proxyport from doing anything useful.

[originally from svn r7133]

diff --git a/proxy.c b/proxy.c
index ad3b8146ce843152ee14a9313d9d2cbbbedfff38..c6008a59d095c4336594352d51cf76848597ad40 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -1369,7 +1369,7 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
                eo += 4;
            }
            else if (strnicmp(cfg->proxy_telnet_command + eo,
-                             "proxyhost", 4) == 0) {
+                             "proxyhost", 9) == 0) {
                int phlen = strlen(cfg->proxy_host);
                ENSURE(phlen);
                memcpy(ret+retlen, cfg->proxy_host, phlen);
@@ -1377,11 +1377,11 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
                eo += 9;
            }
            else if (strnicmp(cfg->proxy_telnet_command + eo,
-                             "proxyport", 4) == 0) {
+                             "proxyport", 9) == 0) {
                 char pport[50];
                int pplen;
                 sprintf(pport, "%d", cfg->proxy_port);
-                pplen = strlen(cfg->proxy_host);
+                pplen = strlen(pport);
                ENSURE(pplen);
                memcpy(ret+retlen, pport, pplen);
                retlen += pplen;