diff options
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | src/chanserv.c | 4 | ||||
| -rw-r--r-- | src/operserv.c | 16 | ||||
| -rw-r--r-- | version.log | 7 |
4 files changed, 22 insertions, 7 deletions
@@ -1,6 +1,8 @@ Anope Version S V N ------------------- Provided by Anope Dev. <dev@anope.org> - 2005 +01/16 A Ulines Servers are now except from NOJOIN bans [#281] +01/16 F IRCops are now except from KillonSQline and KillonSGline [#274] 01/16 F BS Badwords had a false positives if BSCaseSensitive wass enabled [#277] 01/15 F Updated typo in example.conf. [#279] diff --git a/src/chanserv.c b/src/chanserv.c index 073cb2f2a..c8aad1ade 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1672,6 +1672,10 @@ int check_kick(User * user, char *chan) } } + if (is_ulined(user->server->name)) { + return 0; + } + if (check_access(user, ci, CA_NOJOIN)) { get_idealban(ci, user, mask, sizeof(mask)); reason = getstring(user->na, CHAN_NOT_ALLOWED_TO_JOIN); diff --git a/src/operserv.c b/src/operserv.c index 588331da9..11fe65219 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -2599,12 +2599,14 @@ int add_sgline(User * u, char *mask, const char *by, const time_t expires, anope_cmd_sgline(entry->mask, entry->reason); if (KillonSGline && !ircd->sglineenforce) { + snprintf(buf, (BUFSIZE - 1), "G-Lined: %s", entry->reason); u2 = firstuser(); while (u2) { next = nextuser(); - if (match_wild_nocase(entry->mask, u2->realname)) { - snprintf(buf, (BUFSIZE - 1), "G-Lined: %s", entry->reason); - kill_user(ServerName, u2->nick, buf); + if (!is_oper(u2)) { + if (match_wild_nocase(entry->mask, u2->realname)) { + kill_user(ServerName, u2->nick, buf); + } } u2 = next; } @@ -3070,12 +3072,14 @@ int add_sqline(User * u, char *mask, const char *by, const time_t expires, sqline(entry->mask, entry->reason); if (KillonSQline) { + snprintf(buf, (BUFSIZE - 1), "Q-Lined: %s", entry->reason); u2 = firstuser(); while (u2) { next = nextuser(); - if (match_wild_nocase(entry->mask, u2->nick)) { - snprintf(buf, (BUFSIZE - 1), "Q-Lined: %s", entry->reason); - kill_user(ServerName, u2->nick, buf); + if (!is_oper(u2)) { + if (match_wild_nocase(entry->mask, u2->nick)) { + kill_user(ServerName, u2->nick, buf); + } } u2 = next; } diff --git a/version.log b/version.log index 5a92b5a56..87d38c9c8 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,15 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="7" -VERSION_BUILD="540" +VERSION_BUILD="541" # $Log$ # +# BUILD : 1.7.7 (541) +# BUGS : 274, 281 +# NOTES : IRCops are not killed on sqline/sgline when set KillOnSQline or KillOnSGline are enabled, made it so uline +# servers are except from NOJOIN settings +# # BUILD : 1.7.7 (540) # BUGS : 277 # NOTES : BotServ Badwords (START) would return a false positivie when BSCaseSensitive is enabled |