Author: Kev <klmitch@mit.edu>

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

diff --git a/ircd/m_connect.c b/ircd/m_connect.c
index 5c317e38a5919407dabed0a81372b8218775c1f7..81fe44913932295a18e8a90b6f8ba9dbee59d2fe 100644 (file)
--- a/ircd/m_connect.c
+++ b/ircd/m_connect.c
@@ -94,6 +94,7 @@
 #include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
+#include "jupe.h"
 #include "match.h"
 #include "msg.h"
 #include "numeric.h"
@@ -122,7 +123,8 @@ int ms_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   const char*      crule_name;
   struct ConfItem* aconf;
   struct Client*   acptr;
-  
+  struct Jupe*     ajupe;
+
   assert(0 != cptr);
   assert(0 != sptr);
 
@@ -172,6 +174,15 @@ int ms_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
                NumServ(&me), NumNick(sptr), crule_name);
     return 0;
   }
+  /*
+   * Check to see if the server is juped; if it is, disallow the connect
+   */
+  if ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)) {
+    sendto_one(sptr, "%s NOTICE %s%s :Connect: Server %s is juped: %s",
+              NumServ(&me), NumNick(sptr), JupeServer(ajupe),
+              JupeReason(ajupe));
+    return 0;
+  }
   /*
    * Get port number from params, port must be non-zero if it comes from a
    * server.
@@ -222,6 +233,7 @@ int mo_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   const char*      crule_name;
   struct ConfItem* aconf;
   struct Client*   acptr;
+  struct Jupe*     ajupe;
 
   assert(0 != cptr);
   assert(cptr == sptr);
@@ -295,6 +307,14 @@ int mo_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
                me.name, parv[0], crule_name);
     return 0;
   }
+  /*
+   * Check to see if the server is juped; if it is, disallow the connect
+   */
+  if ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)) {
+    sendto_one(sptr, "%s NOTICE %s%s :Connect: Server %s is juped: %s",
+              me.name, NumNick(sptr), JupeServer(ajupe), JupeReason(ajupe));
+    return 0;
+  }
   /*
    *  Get port number from user, if given. If not specified,
    *  use the default from configuration structure. If missing
@@ -349,6 +369,7 @@ int m_connect(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   struct ConfItem* aconf;
   struct ConfItem* cconf;
   struct Client*   acptr;
+  struct Jupe*     ajupe;
 
   if (!IsPrivileged(sptr)) {
     sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
@@ -466,6 +487,15 @@ int m_connect(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       }
     }
   }
+  /*
+   * Check to see if the server is juped; if it is, disallow the connect
+   */
+  if ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)) {
+    sendto_one(sptr, "%s NOTICE %s%s :Connect: Server %s is juped: %s",
+              NumServ(&me), NumNick(sptr), JupeServer(ajupe),
+              JupeReason(ajupe));
+    return 0;
+  }
 
   /*
    * Notify all operators about remote connect requests