fix minor EnfModes bug in chanserv.c

* address bug id #955105; minor EnfModes issue

git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-63

diff --git a/ChangeLog b/ChangeLog
index bdb3549866b51483e548524e8dc0c3a657d8dc03..19df33798678ea28a4e085bf13772d54a4f66f35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2004-srvx/srvx--devo--1.3
 #
 
+2004-05-17 09:44:35 GMT        adam <adam@gamesurge.net>       patch-63
+
+    Summary:
+      fix minor EnfModes bug in chanserv.c 
+    Revision:
+      srvx--devo--1.3--patch-63
+
+    * address bug id #955105; minor EnfModes issue
+    
+
+    modified files:
+     ChangeLog src/chanserv.c
+
+
 2004-05-14 06:27:30 GMT        adam <adam@gamesurge.net>       patch-62
 
     Summary:

diff --git a/src/chanserv.c b/src/chanserv.c
index 49eb75c918d905532d0147a97cbcd01e45304d4a..b347a8c6003561a769e944104aaac4e45602f265 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1010,10 +1010,10 @@ mode_lock_violated(const struct mod_chanmode *orig, const struct mod_chanmode *c
         return 1;
     if(orig->modes_clear & change->modes_set)
         return 1;
-    if((orig->modes_set & MODE_KEY)
+    if((orig->modes_set & MODE_KEY) && (change->modes_set & MODE_KEY)
        && strcmp(orig->new_key, change->new_key))
         return 1;
-    if((orig->modes_set & MODE_LIMIT)
+    if((orig->modes_set & MODE_LIMIT) && (change->modes_set & MODE_LIMIT)
        && (orig->new_limit != change->new_limit))
         return 1;
     return 0;