Treat G-line-related times as network times, rather than local times.

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

diff --git a/ircd/m_settime.c b/ircd/m_settime.c
index f770258ab3ce382991e1727382fc3422914fbb0e..39ec6aa39a708c926bba9ce48e14d542515dc925 100644 (file)
--- a/ircd/m_settime.c
+++ b/ircd/m_settime.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -96,7 +97,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /*
@@ -123,10 +124,10 @@ int ms_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (t < OLDEST_TS || dt < -9000000)
   {
     if (IsServer(sptr)) /* protocol violation if it's from a server */
-      protocol_violation(sptr, "SETTIME: Bad value (%Tu, delta %l)", t, dt);
+      protocol_violation(sptr, "SETTIME: Bad value (%Tu, delta %ld)", t, dt);
     else
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :SETTIME: Bad value (%Tu, "
-                    "delta %l)", sptr, t, dt);
+                    "delta %ld)", sptr, t, dt);
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :SETTIME: Bad value", sptr);
     return 0;
   }
@@ -164,7 +165,7 @@ int ms_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     /* don't apply settime--reliable */
     if ((dt > 600) || (dt < -600))
       sendcmdto_serv_butone(&me, CMD_DESYNCH, 0, ":Bad SETTIME from %s: %Tu "
-                            "(delta %l)", cli_name(sptr), t, dt);
+                            "(delta %ld)", cli_name(sptr), t, dt);
     /* Let user know we're ignoring him */
     if (IsUser(sptr))
     {
@@ -242,11 +243,11 @@ int mo_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   {
     if ((dt > 600) || (dt < -600))
       sendcmdto_serv_butone(&me, CMD_DESYNCH, 0, ":Bad SETTIME from %s: %Tu "
-                            "(delta %l)", cli_name(sptr), t, dt);
+                            "(delta %ld)", cli_name(sptr), t, dt);
     if (IsUser(sptr)) /* Let user know we're ignoring him */
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :clock is not set %ld seconds "
                     "%s: RELIABLE_CLOCK is defined", sptr, (dt < 0) ? -dt : dt,
-                    (dt < 0) ? "forward" : "backward");
+                    (dt < 0) ? "forwards" : "backwards");
   }
   else /* tell opers about time change */
   {