Author: Bleep <tomh@inxpress.net>

Log message:
Back port bug fix from 2.10.10

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@168 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index e5a3ebb3b07657fca44d575740991080d847eb7c..9268266ad40c5fef8c5ff0202e40a3712ea9439c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2000-04-13  Thomas Helvey <tomh@inxpress.net>
+       * ircd/IPcheck.c: Back port BLMet's bugfix from 2.10.10
+
 2000-04-13  Greg Sikorski <gte@atomicrevs.demon.co.uk>
 
        * ircd/whocmds.c: Don't make idle flag default in /who, to prevent:
@@ -443,7 +446,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.80 2000-04-13 20:07:13 gte Exp $
+# $Id: ChangeLog,v 1.81 2000-04-14 02:56:22 bleep Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/include/numeric.h b/include/numeric.h
index 79827215a2a6d72b54b33c35097b975927c16558..eee9e3f88230a23d8b7c9ab707bb59652dc166ec 100644 (file)
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -369,6 +369,5 @@ extern const struct Numeric* get_error_numeric(int err);
 #define ERR_BADEXPIRE        515        /* Undernet extension - jupe -Kev */
 #define ERR_DONTCHEAT       516        /* Undernet extension */
 #define ERR_LASTERROR        517
-#define ERR_POPTIX           518        /* Undernet extension */
 
 #endif /* INCLUDED_numeric_h */

diff --git a/ircd/IPcheck.c b/ircd/IPcheck.c
index fd9173f915849ec98667878e696b296ebefa0fee..ac9b0c6799e890d95b883b34064babea38d3c6a8 100644 (file)
--- a/ircd/IPcheck.c
+++ b/ircd/IPcheck.c
@@ -247,6 +247,8 @@ int ip_registry_check_local(unsigned int addr, time_t* next_target_out)
 #ifdef NOTHROTTLE 
     return 1;
 #else
+    /* Thanks BLMet :) */
+    --entry->connected;
     return 0;
 #endif        
   }

diff --git a/ircd/channel.c b/ircd/channel.c
index 2dd8cba2938b105db5db5db9c6fd7d82ff8c5f15..31011730600bc82988728926c9c3d425e0afae53 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -107,7 +107,7 @@ struct Membership* find_member_link(struct Channel* chptr, const struct Client*
       assert(m->channel == chptr);
       if (m->user == cptr)
         return m;
-      m=m->next_member;
+      m = m->next_member;
     }
   }
   /* Users on the other hand aren't allowed on more than 15 channels.  50%
@@ -120,7 +120,7 @@ struct Membership* find_member_link(struct Channel* chptr, const struct Client*
      assert(m->user == cptr);
      if (m->channel == chptr)
        return m;
-     m=m->next_channel;
+     m = m->next_channel;
    }
   }
   return 0;

diff --git a/ircd/s_err.c b/ircd/s_err.c
index ae219c628ca77f6d2ad6447beb8defa0af3cedae..416af23d758c4bca44256d8f34b6377bb1ffa2b5 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -1074,7 +1074,7 @@ static Numeric replyTable[] = {
 /* 517 */
   { 0 },
 /* 518 */
-  { ERR_POPTIX, " :While you have been watching us chat in your status window, we have HaX0rd your computer", "666" },
+  { 0 },
 /* 519 */
   { 0 },
 /* 520 */