From 37d69eb7c1a861740d05b0345800f737bd916c3d Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 17 May 2004 09:44:35 +0000 Subject: [PATCH] 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 --- ChangeLog | 14 ++++++++++++++ src/chanserv.c | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdb3549..19df337 100644 --- 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 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 patch-62 Summary: diff --git a/src/chanserv.c b/src/chanserv.c index 49eb75c..b347a8c 100644 --- 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; -- 2.20.1