diff options
| author | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2005-05-05 16:11:41 +0000 |
|---|---|---|
| committer | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2005-05-05 16:11:41 +0000 |
| commit | 94963049525556bc7fdbebd6548b248c5ae3831c (patch) | |
| tree | 98a073f454bcd2da97ef6bb2006307d9c5fd2964 | |
| parent | a33e31d79006cc58126f1f3d0fe67505ec854270 (diff) | |
BUILD : 1.7.9 (774) BUGS : 366 NOTES : Updated chan_set_correct_modes() to work ok with U:Lined servers and added checking for OPDEOPME next to AUTOOP levels (same for the other modes)
git-svn-id: svn://svn.anope.org/anope/trunk@774 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@534 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | include/services.h | 1 | ||||
| -rw-r--r-- | src/channels.c | 14 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 17 insertions, 6 deletions
@@ -1,5 +1,7 @@ Anope Version S V N ------------------- +05/05 F ULined servers still got their modes removed with SecureOps on. [ #00] +05/05 F Missing access checks when removing modes due to SecureOps. [#366] Provided by Anope Dev. <dev@anope.org> - 2005 Anope Version 1.7.9 diff --git a/include/services.h b/include/services.h index c6e171908..c030e7e69 100644 --- a/include/services.h +++ b/include/services.h @@ -715,6 +715,7 @@ struct chaninfo_ { /* #define CA_AUTOADMIN 32 #define CA_ADMINME 33 #define CA_ADMIN 34 */ + /* Why are these commented out and not removed? -GD */ #define CA_BANME 32 #define CA_BAN 33 #define CA_TOPIC 34 diff --git a/src/channels.c b/src/channels.c index 88272b29f..f6e5daaff 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1293,7 +1293,7 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes) status = chan_get_user_status(c, user); - if (debug >= 2) + if (debug) alog("debug: Setting correct user modes for %s on %s (current status: %d, %sgiving modes)", user->nick, c->name, status, (give_modes ? "" : "not ")); if (give_modes && (get_ignore(user->nick) == NULL)) { @@ -1318,7 +1318,8 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes) * on, because else every mode is legal. -GD * Unless the channel has just been created. -heinz */ - if ((ci->flags & CI_SECUREOPS) || c->usercount == 1) { + if (((ci->flags & CI_SECUREOPS) || (c->usercount == 1)) + && !is_ulined(user->server->name)) { if (ircd->owner && (status & CUS_OWNER) && !(((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci)) @@ -1326,12 +1327,15 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes) && is_founder(user, ci)))) rem_modes |= CUS_OWNER; if ((ircd->protect || ircd->admin) && (status & CUS_PROTECT) - && !check_access(user, ci, CA_AUTOPROTECT)) + && !check_access(user, ci, CA_AUTOPROTECT) + && !check_access(user, ci, CA_PROTECTME)) rem_modes |= CUS_PROTECT; - if ((status & CUS_OP) && !check_access(user, ci, CA_AUTOOP)) + if ((status & CUS_OP) && !check_access(user, ci, CA_AUTOOP) + && !check_access(user, ci, CA_OPDEOPME)) rem_modes |= CUS_OP; if (ircd->halfop && (status & CUS_HALFOP) - && !check_access(user, ci, CA_AUTOHALFOP)) + && !check_access(user, ci, CA_AUTOHALFOP) + && !check_access(user, ci, CA_HALFOPME)) rem_modes |= CUS_HALFOP; } diff --git a/version.log b/version.log index 2add5173b..660629bf6 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="9" -VERSION_BUILD="773" +VERSION_BUILD="774" # $Log$ # +# BUILD : 1.7.9 (774) +# BUGS : 366 +# NOTES : Updated chan_set_correct_modes() to work ok with U:Lined servers and added checking for OPDEOPME next to AUTOOP levels (same for the other modes) +# # BUILD : 1.7.9 (773) # BUGS : none # NOTES : Development Framework. |