]> jfr.im git - solanum.git/commitdiff
CONNECT: allow using 3-argument CONNECT with port == 0 locally (closes #119)
authorWilliam Pitcock <redacted>
Tue, 12 Jan 2016 11:54:04 +0000 (05:54 -0600)
committerWilliam Pitcock <redacted>
Tue, 12 Jan 2016 11:54:04 +0000 (05:54 -0600)
modules/m_connect.c

index 5991905273acd067c63f35dde442664b03529cb2..6edd210cf548b92b5250ba0d7897d8e5c4892156 100644 (file)
@@ -110,20 +110,17 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
         * use the default form configuration structure. If missing
         * from there, then use the precompiled default.
         */
-       tmpport = port = server_p->port;
+       tmpport = port = 0;
        if(parc > 2 && !EmptyString(parv[2]))
+               port = atoi(parv[2]);
+       if(port == 0 && server_p->port)
+               port = server_p->port;
+       else if(port <= 0)
        {
-               if((port = atoi(parv[2])) <= 0)
-               {
-                       sendto_one_notice(source_p, ":Connect: Illegal port number");
-                       return 0;
-               }
-       }
-       else if(port <= 0 && (port = PORTNUM) <= 0)
-       {
-               sendto_one_notice(source_p, ":Connect: missing port number");
+               sendto_one_notice(source_p, ":Connect: illegal port number");
                return 0;
        }
+       
        /*
         * Notify all operators about remote connect requests
         */