[Patches] [CVS] Module ircu2.10: Change committed

[Entrope]

Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Commit time: 2004-11-07 21:34:45 UTC

Modified files:
     ChangeLog ircd/m_server.c

Log message:

Assign timestamp before it might be used in exit_new_server().

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.506 ircu2.10/ChangeLog:1.507
--- ircu2.10/ChangeLog:1.506    Sun Nov  7 13:13:55 2004
+++ ircu2.10/ChangeLog  Sun Nov  7 13:34:34 2004
@@ -1,5 +1,10 @@
 2004-11-07  Michael Poole <[EMAIL PROTECTED]>
 
+       * ircd/m_server.c (m_server, ms_server): Assign timestamp before
+       it might be used in exit_new_server().
+
+2004-11-07  Michael Poole <[EMAIL PROTECTED]>
+
        * aclocal.m4, config.h.in, configure, ircd/Makefile.in: Regenerate
        to reflect the changes since these files' last rebuild.
 
Index: ircu2.10/ircd/m_server.c
diff -u ircu2.10/ircd/m_server.c:1.33 ircu2.10/ircd/m_server.c:1.34
--- ircu2.10/ircd/m_server.c:1.33       Sat Oct 16 17:47:08 2004
+++ ircu2.10/ircd/m_server.c    Sun Nov  7 13:34:35 2004
@@ -22,7 +22,7 @@
  */
 /** @file
  * @brief Handlers for the SERVER command.
- * @version $Id: m_server.c,v 1.33 2004/10/17 00:47:08 entrope Exp $
+ * @version $Id: m_server.c,v 1.34 2004/11/07 21:34:35 entrope Exp $
  */
 
 #include "config.h"
@@ -544,6 +544,9 @@
   /*
    * Detect protocol
    */
+  hop = atoi(parv[2]);
+  start_timestamp = atoi(parv[3]);
+  timestamp = atoi(parv[4]);
   prot = parse_protocol(parv[5]);
   if (!prot)
     return exit_client_msg(cptr, sptr, &me, "Bogus protocol (%s)", parv[5]);
@@ -551,9 +554,6 @@
     return exit_new_server(cptr, sptr, host, timestamp,
                            "Incompatible protocol: %s", parv[5]);
 
-  hop = atoi(parv[2]);
-  start_timestamp = atoi(parv[3]);
-  timestamp = atoi(parv[4]);
   Debug((DEBUG_INFO, "Got SERVER %s with timestamp [%s] age %Tu (%Tu)",
         host, parv[4], start_timestamp, cli_serv(&me)->timestamp));
 
@@ -688,6 +688,9 @@
   /*
    * Detect protocol
    */
+  hop = atoi(parv[2]);
+  start_timestamp = atoi(parv[3]);
+  timestamp = atoi(parv[4]);
   prot = parse_protocol(parv[5]);
   if (!prot)
     return exit_client_msg(cptr, sptr, &me, "Bogus protocol (%s)", parv[5]);
@@ -695,9 +698,6 @@
     return exit_new_server(cptr, sptr, host, timestamp,
                            "Incompatible protocol: %s", parv[5]);
 
-  hop = atoi(parv[2]);
-  start_timestamp = atoi(parv[3]);
-  timestamp = atoi(parv[4]);
   Debug((DEBUG_INFO, "Got SERVER %s with timestamp [%s] age %Tu (%Tu)",
         host, parv[4], start_timestamp, cli_serv(&me)->timestamp));
 
----------------------- End of diff -----------------------