Author: Kev <klmitch@mit.edu>

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

diff --git a/ircd/m_squit.c b/ircd/m_squit.c
index 67d541bff1d15fc31b3ed57bbd4200434f068c54..ce4dd9991c99cea160e30dbefa21550f9029ba9a 100644 (file)
--- a/ircd/m_squit.c
+++ b/ircd/m_squit.c
@@ -28,6 +28,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
@@ -38,7 +39,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -60,7 +61,7 @@ int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   const char* server = parv[1];
   struct Client *acptr;
-  time_t timestamp;
+  time_t timestamp = 0;
   char *comment = 0;
   
   if (parc < 2) 
@@ -71,33 +72,30 @@ int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (BadPtr(parv[parc - 1]))
        comment = cli_name(sptr);
        
-  acptr = FindNServer(server);
+  acptr = FindServer(server);
 
   if (!acptr)
-    acptr = FindServer(server);
+    acptr = FindNServer(server);
 
   if (!acptr) {
-    protocol_violation(sptr, "Issued SQUIT for unknown server %s (ignored)",
-                      server);
     Debug((DEBUG_NOTICE, "Ignoring SQUIT to an unknown server"));
     return 0;
   }
   
   /* If they are squitting me, we reverse it */
-  if (IsMe(acptr)) {
-       cptr = acptr;
-       acptr = &me;
-  }
-       
-  timestamp = atoi(parv[2]);
+  if (IsMe(acptr))
+    acptr = cptr; /* Bugfix by Prefect */
+
+  if (parc > 2)
+    timestamp = atoi(parv[2]);
+  else
+    protocol_violation(cptr, "SQUIT with no timestamp/reason");
 
   /* If atoi(parv[2]) == 0 we must indeed squit !
    * It will be our neighbour.
    */
-  if ( timestamp != 0 && timestamp != cli_serv(acptr)->timestamp) {
-    protocol_violation(sptr, "Issued SQUIT for %C with wrong timestamp %Tu "
-                      "(%Tu) (ignored)", acptr, timestamp,
-                      cli_serv(acptr)->timestamp);
+  if ( timestamp != 0 && timestamp != cli_serv(acptr)->timestamp)
+  {
     Debug((DEBUG_NOTICE, "Ignoring SQUIT with the wrong timestamp"));
     return 0;
   }