Author: Isomer <isomer@coders.net>

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

diff --git a/ircd/m_create.c b/ircd/m_create.c
index f413c29ba4881f867f0fea770b9cb813a1207cb4..0892850310806d99df600626469ae41d9171ee3a 100644 (file)
--- a/ircd/m_create.c
+++ b/ircd/m_create.c
@@ -79,14 +79,8 @@
  *            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 "channel.h"
 #include "client.h"
 #include "hash.h"
@@ -138,18 +132,16 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       MAGIC_REMOTE_JOIN_TS != chanTS)
     cli_serv(cli_user(sptr)->server)->lag = TStime() - chanTS;
 
-#if 1
-  /* If this server is >5 minutes fast, squit it */
-  if (TStime() - chanTS<-5*60*60)
-       return exit_client(sptr, sptr, &me, "Timestamp Drift/Bogus TS");
-#endif
-#if 0          
-  /* If we recieve a CREATE for a channel from a server before that server
-   * was linked, then it's a HACK
-   */
-  if (MyConnect(sptr) && chanTS<cli_timestamp(sptr)+5*60*60)
-       return exit_client(sptr,sptr,"HACK: Bogus TS on CREATE before server link");
-#endif
+  /* If this server is >1 minute fast, warn */
+  if (TStime() - chanTS<-60) {
+    static int rate;
+    sendto_opmask_butone_ratelimited(0,SNO_NETWORK,&rate,
+       "Timestamp drift from %s (%is)",cli_name(cptr),chanTS-TStime());
+
+    /* If this server is >5 minutes fast, squit it */
+    if (TStime() - chanTS<-5*60*60)
+      return exit_client(sptr, sptr, &me, "Timestamp Drift/Bogus TS");
+  }
 
   /* For each channel in the comma seperated list: */
   for (name = ircd_strtok(&p, parv[1], ","); name;