Fix sending PASS with spaces or starting with :

Closes #2186
Closes #1550

diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 9a53ed2e86199c12b03c888dfc9130e9ff1341c2..776d14342611854979ba129f59097c9e87eb1ac3 100644 (file)
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -53,7 +53,9 @@ irc_login (server *serv, char *user, char *realname)
 
        if (serv->password[0] && serv->loginmethod == LOGIN_PASS)
        {
-               tcp_sendf (serv, "PASS %s\r\n", serv->password);
+               tcp_sendf (serv, "PASS %s%s\r\n",
+                       (serv->password[0] == ':' || strchr (serv->password, ' ')) ? ":" : "",
+                       serv->password);
        }
 
        tcp_sendf (serv,