pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 21:46:38 +02:00
Code Activity

Fixed MLOCK locked mode removal getting priority over DEFCON locked

Browse Source 
mode setting.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2485 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
jantje_85
2009-08-30 17:37:35 +00:00
parent efa7c81ca8
commit 664ca1bbf2
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+1
View File
@@ -14,6 +14,7 @@ Provided by Anope Dev. <team@anope.org> - 2009
08/27 F Fixed services sending no or wrong help to opers. [#1103]
08/27 F Fixed services sending no or wrong help to opers. [#1104]
08/29 F Fixed defcon failing to set and remove modes. [#1101]
08/30 F Fixed MLOCK superseding DEFCON mode lock. [ #00]
Provided by Han` <Han@mefalcon.org> - 2009
07/28 F Updated german language file. [ #00]
src/chanserv.c
+5 -1
View File
@@ -1202,8 +1202,12 @@ void check_modes(Channel * c)
end--;
modes = 0;
if (ci)
if (ci) {
modes = c->mode & ci->mlock_off;
/* Make sure we don't remove a mode just set by defcon.. ~ Viper */
if (DefConModesSet)
modes &= ~(modes & DefConModesOn);
}
if (DefConModesSet)
modes |= c->mode & DefConModesOff;
src/operserv.c
+1 -1
View File
@@ -1629,8 +1629,8 @@ void runDefCon(void)
if (DefConChanModes && !DefConModesSet) {
if (DefConChanModes[0] == '+' || DefConChanModes[0] == '-') {
alog("DEFCON: setting %s on all chan's", DefConChanModes);
do_mass_mode(DefConChanModes);
DefConModesSet = 1;
do_mass_mode(DefConChanModes);
}
}
} else {
version.log
+3 -2
View File
@@ -3,15 +3,16 @@
#
# Please read COPYING and README for further details.
#
# $Id: version.log 2479 2009-08-28 23:42:16Z adam- $
# $Id$
VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="2"
VERSION_EXTRA="-svn"
VERSION_BUILD="2480"
VERSION_BUILD="2485"
# $Log$ # Changes since 1.8.2 Release
#Revision 2485 - Fixed MLOCK locked mode removal getting priority over DEFCON locked mode setting.
#Revision 2480 - Fixed defcon not setting modes on newly created unregged channels and failing to force remove defcon-locked modes.
#Revision 2479 - Updated German language file
#Revision 2477 - Corrected help replies for /operserv HELP *NEWS to say services admin is always required