* Port [3516] to 1.2.14

 * Fix broken ISON from [3371]
 * Fix erroneus nickname rotating/grabbing



svn: 3517

src/main.c

@@ -469,7 +469,7 @@ static void core_secondly()
 #endif /* CRAZY_TRACE */
   if (fork_interval && backgrd && ((now - lastfork) > fork_interval))
       do_fork();
-  cnt++;
+  ++cnt;
 
   if ((cnt % 30) == 0) {
     autolink_cycle(NULL);         /* attempt autolinks */
@@ -483,7 +483,7 @@ static void core_secondly()
       server_send_ison();
       ison_cnt = 0;
     } else
-      ison_cnt++;
+      ++ison_cnt;
   }
 
   egg_memcpy(&nowtm, gmtime(&now), sizeof(struct tm));

src/mod/server.mod/servmsg.c

@@ -770,7 +770,7 @@ static void got303(char *from, char *msg)
   newsplit(&msg);
   fixcolon(msg);
   tmp = newsplit(&msg);
-  if (tmp[0] && !match_my_nick(tmp)) {
+  if (tmp[0] && match_my_nick(tmp)) {
     bool ison_orig = 0;
 
     while ((tmp = newsplit(&msg))[0]) {
@@ -802,7 +802,7 @@ static int got432(char *from, char *msg)
   else {
     putlog(LOG_MISC, "*", "Server says my nickname '%s' is invalid.", botname);
     rotate_nick(botname, origbotname);
-    dprintf(DP_MODE, "NICK %s\n", erroneus);
+    dprintf(DP_MODE, "NICK %s\n", botname);
     return 0;
   }
   return 0;