Author: Isomer <isomer@coders.net>

[ircu2.10.12-pk.git] / ircd / m_connect.c

diff --git a/ircd/m_connect.c b/ircd/m_connect.c
index 0330e4fa6a267024f5b3a432a902194a57a84610..8c8e7ed0e46b3e2af5a8672d2e3e3270c3f05d89 100644 (file)
--- a/ircd/m_connect.c
+++ b/ircd/m_connect.c
@@ -79,18 +79,13 @@
  *            note:   it is guaranteed that parv[0]..parv[parc-1] are all
  *                    non-NULL pointers.
  */
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
+#include "config.h"
+
 #include "client.h"
 #include "crule.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_features.h"
 #include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
@@ -137,6 +132,7 @@ int ms_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
      * checked it's args, if we don't have parc == 4, something
      * isn't right.
      */
+    protocol_violation(sptr, "Too few parameters to connect");
     return need_more_params(sptr, "CONNECT");
   }
 
@@ -199,7 +195,7 @@ int ms_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   /*
    * Notify all operators about remote connect requests
    */
-  sendcmdto_flag_butone(&me, CMD_WALLOPS, 0, FLAGS_WALLOP,
+  sendwallto_group_butone(&me, WALL_WALLOPS, 0,
                        ":Remote CONNECT %s %s from %s", parv[1],
                        parv[2] ? parv[2] : "",
                        get_client_name(sptr, HIDE_IP));
@@ -327,7 +323,7 @@ int mo_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       return 0;
     }
   }
-  if (0 == port && 0 == (port = SERVER_PORT)) {
+  if (0 == port && 0 == (port = feature_int(FEAT_SERVER_PORT))) {
     sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Connect: missing port number",
                  sptr);
     return 0;