Fix "echo off" issues

Found by: michaelortmann
Patch by: michaelortmann

- Fix "echo off" for command .su
- Fix propagating telnet status for command .relay. The propagation is necessary, so that the destination bot can send telnet control codes like "echo off"

Author: michaelortmann

src/botnet.c

@@ -1418,6 +1418,8 @@ static void cont_tandem_relay(int idx, char *buf, int i)
   check_tcl_chof(dcc[uidx].nick, dcc[uidx].sock);
   dcc[uidx].type = &DCC_RELAYING;
   dcc[uidx].u.relay = ri;
+  if (dcc[uidx].status & STAT_TELNET)
+    tputs(dcc[idx].sock, TLN_IAC_C TLN_DO_C TLN_STATUS_C, 3);
 }
 
 static void eof_dcc_relay(int idx)
@@ -1436,7 +1438,7 @@ static void eof_dcc_relay(int idx)
   dcc[j].status = dcc[j].u.relay->old_status;
   /* In case echo was off, turn it back on (send IAC WON'T ECHO): */
   if (dcc[j].status & STAT_TELNET)
-    dprintf(j, TLN_IAC_C TLN_WONT_C TLN_ECHO_C "\n");
+    tputs(dcc[j].sock, TLN_IAC_C TLN_WONT_C TLN_ECHO_C, 3);
   putlog(LOG_MISC, "*", "%s: %s -> %s", BOT_ENDRELAY1, dcc[j].nick,
          dcc[idx].nick);
   dprintf(j, "\n\n*** %s %s\n", BOT_ENDRELAY2, botnetnick);

src/cmds.c

@@ -2753,9 +2753,13 @@ static void cmd_su(struct userrec *u, int idx, char *par)
         dcc[idx].user = u;
         strcpy(dcc[idx].nick, par);
         /* Display password prompt and turn off echo (send IAC WILL ECHO). */
-        dprintf(idx, "Enter password for %s%s\n", par,
-                (dcc[idx].status & STAT_TELNET) ? TLN_IAC_C TLN_WILL_C
-                TLN_ECHO_C : "");
+        if (dcc[idx].status & STAT_TELNET) {
+          char buf[512];
+          snprintf(buf, sizeof buf, "Enter password for %s" TLN_IAC_C TLN_WILL_C
+                   TLN_ECHO_C "\r\n", par);
+          tputs(dcc[idx].sock, buf, strlen(buf));
+        } else
+          dprintf(idx, "Enter password for %s\n", par);
         dcc[idx].type = &DCC_CHAT_PASS;
       } else if (atr & USER_OWNER) {
         if (dcc[idx].u.chat->channel < GLOBAL_CHANS)

src/dcc.c

@@ -1832,8 +1832,8 @@ static void dcc_telnet_pass(int idx, int atr)
 
     /* Turn off remote telnet echo (send IAC WILL ECHO). */
     if (dcc[idx].status & STAT_TELNET) {
-      char buf[1030];
-      egg_snprintf(buf, sizeof buf, "\n%s%s\r\n", escape_telnet(DCC_ENTERPASS),
+      char buf[512];
+      snprintf(buf, sizeof buf, "\n%s%s\r\n", escape_telnet(DCC_ENTERPASS),
                TLN_IAC_C TLN_WILL_C TLN_ECHO_C);
       tputs(dcc[idx].sock, buf, strlen(buf));
     } else