Author: Kev <klmitch@mit.edu>

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

diff --git a/ircd/m_create.c b/ircd/m_create.c
index e89afa39973ff2ae9886e04b3bd87a571222b8aa..fcedeb0e09196f4ab993344c125d0f275bb766d8 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"
@@ -97,6 +91,7 @@
 #include "numeric.h"
 #include "numnicks.h"
 #include "s_debug.h"
+#include "s_misc.h"
 #include "s_user.h"
 #include "send.h"
 
@@ -119,7 +114,7 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   int badop; /* a flag */
 
   if (IsServer(sptr))
-    return protocol_violation(sptr,"%s tried to CREATE a channel", sptr->name);
+    return protocol_violation(sptr,"%s tried to CREATE a channel", cli_name(sptr));
 
   /* sanity checks: Only accept CREATE messages from servers */
   if (parc < 3 || *parv[2] == '\0')
@@ -135,20 +130,11 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
    */
   if (!IsBurstOrBurstAck(sptr) && 0 != chanTS &&
       MAGIC_REMOTE_JOIN_TS != chanTS)
-    sptr->user->server->serv->lag = TStime() - 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,"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<sptr->timestamp+5*60*60)
-       return exit_client(sptr,sptr,"HACK: Bogus TS on CREATE before server link");
-#endif
+       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;