diff options
| author | attilamolnar <attilamolnar@hush.com> | 2012-07-04 17:19:34 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2012-11-19 18:32:41 +0100 |
| commit | 7eab4fd473143be2516037b114d48b89cc481fc4 (patch) | |
| tree | 8fd5cb9d3c6ef15be6ee86f7171fd7db37427836 | |
| parent | ba5c0db795824c3fc1ad48ce332d7bdc440cb77f (diff) | |
m_remove, m_services_account Don't check whether nicks are u-lined, checking the server is enough
| -rw-r--r-- | src/modules/m_remove.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_services_account.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 7d0ae7eea..ae583315a 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -88,7 +88,8 @@ class RemoveBase : public Command hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q')); - if((ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str()))){ + if (ServerInstance->ULine(target->server)) + { user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame); return CMD_FAILURE; } diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 635dc284b..a32527577 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -37,7 +37,7 @@ class Channel_r : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { // only a u-lined server may add or remove the +r mode. - if (!IS_LOCAL(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server)) + if (!IS_LOCAL(source) || ServerInstance->ULine(source->server)) { // Only change the mode if it's not redundant if ((adding != channel->IsModeSet('r'))) @@ -64,7 +64,7 @@ class User_r : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (!IS_LOCAL(source) || ServerInstance->ULine(source->nick.c_str()) || ServerInstance->ULine(source->server)) + if (!IS_LOCAL(source) || ServerInstance->ULine(source->server)) { if ((adding != dest->IsModeSet('r'))) { |