From: Bleep <twhelvey1@home.com>
Date: Fri, 14 Apr 2000 02:56:23 +0000 (+0000)
Subject: Author: Bleep <tomh@inxpress.net>
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=634a54dfb51a89cf8df39b8a3b71645418db2b31;p=ircu2.10.12-pk.git

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 e5a3ebb..9268266 100644
--- 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 7982721..eee9e3f 100644
--- 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 fd9173f..ac9b0c6 100644
--- 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 2dd8cba..3101173 100644
--- 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 ae219c6..416af23 100644
--- 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 */