From c8477ddb6ac5cb6794bd4f7ac5647fca8eafe71b Mon Sep 17 00:00:00 2001
From: codemastr <devnull@localhost>
Date: Sun, 13 Apr 2003 17:42:23 +0000
Subject: [PATCH] Made except ban override ban ip

---
 Changes      | 1 +
 src/s_conf.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index ddcd423e8..98d5c366b 100644
--- a/Changes
+++ b/Changes
@@ -2047,3 +2047,4 @@ seen. gmtime warning still there
   of replacing the word with "<censored>" it will block the message from ever being sent. 
   (#0000557) suggested by paranomix
 - Made /stats b output badword quit {} (#0000883) reported by AngryWolf
+- Made except ban {} override ban ip {} (suggested by Lithium).
diff --git a/src/s_conf.c b/src/s_conf.c
index a33e73626..9b120049e 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -1976,7 +1976,8 @@ ConfigItem_ban 	*Find_ban(char *host, short type)
 		if (ban->flag.type == type)
 			if (!match(ban->mask, host)) {
 				/* Person got a exception */
-				if (type == CONF_BAN_USER && Find_except(host, CONF_EXCEPT_BAN))
+				if ((type == CONF_BAN_USER || type == CONF_BAN_IP)
+				    && Find_except(host, CONF_EXCEPT_BAN))
 					return NULL;
 				return ban;
 			}