From fe09b2e57ab6daa601239a0d222619e959b81751 Mon Sep 17 00:00:00 2001
From: "rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b"
 <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Thu, 22 Jul 2004 16:22:42 +0000
Subject: [PATCH] BUILD : 1.7.4 (272) BUGS : 111,115 NOTES : Fixed bugs 111 and
 115, both need backporting to 1.6.x

git-svn-id: svn://svn.anope.org/anope/trunk@272 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@176 5417fbe8-f217-4b02-8779-1006273d7864
---
 Changes.lang   | 1 +
 lang/en_us.l   | 2 +-
 src/operserv.c | 2 +-
 version.log    | 7 ++++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Changes.lang b/Changes.lang
index 1ee47b1d4..06782e1ed 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -3,6 +3,7 @@ Anope Version S V N
 *** New Strings:
 *** Mod Strings:
   MEMO_HELP
+  CHAN_LEVEL_NOJOIN
 *** Del Strings:
 
 Anope Version 1.7.4
diff --git a/lang/en_us.l b/lang/en_us.l
index 47073e9fc..78e27850e 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -753,7 +753,7 @@ CHAN_LEVEL_AUTOPROTECT
 CHAN_LEVEL_AUTODEOP
 	Channel operator status disallowed
 CHAN_LEVEL_NOJOIN
-	Not allowed to join channel if RESTRICTED
+	Not allowed to join channel
 CHAN_LEVEL_INVITE
 	Allowed to use INVITE command
 CHAN_LEVEL_AKICK
diff --git a/src/operserv.c b/src/operserv.c
index e070b55b0..d42ab7de1 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -4416,7 +4416,7 @@ static int do_noop(User * u)
         for (u2 = firstuser(); u2; u2 = u3) {
             u3 = nextuser();
             if ((u2) && is_oper(u2) && (u2->server->name)
-                && !stricmp(u2->server->name, server)) {
+                && match_wild(server,u2->server->name)) {
                 kill_user(s_OperServ, u2->nick, reason);
             }
         }
diff --git a/version.log b/version.log
index 3a0ae9f06..61d8ad58f 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,15 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="4"
-VERSION_BUILD="271"
+VERSION_BUILD="272"
 
 # $Log$
 #
+# BUILD : 1.7.4 (272)
+# BUGS  : 111,115
+# NOTES : Fixed bugs 111 and 115, both need backporting to 1.6.x
+# 
+#
 # BUILD : 1.7.4 (271)
 # BUGS  : 
 # NOTES : Rolled Back to 291 for GeniusDex