diff options
| author | Adam <Adam@anope.org> | 2017-04-06 16:31:35 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2017-04-06 16:31:35 -0400 |
| commit | 2f5eae1633cfa691ea461bf74c0c85506676d1e1 (patch) | |
| tree | 852a3d2591bb28f6e2881ff1c4b6ae8ae00f9358 | |
| parent | 25b2fd0730f199f5fb8d3888906e0b600c62e55a (diff) | |
| parent | 07f72a3122479bb10c923a5f72b316297e388a7f (diff) | |
Merge commit '07f72a3122479bb10c923a5f72b316297e388a7f'
| -rw-r--r-- | modules/operserv/list.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/operserv/list.cpp b/modules/operserv/list.cpp index 39ca2288b..77eaf56ed 100644 --- a/modules/operserv/list.cpp +++ b/modules/operserv/list.cpp @@ -182,8 +182,13 @@ class CommandOSUserList : public Command if (!pattern.empty()) { - Anope::string mask = u2->nick + "!" + u2->GetIdent() + "@" + u2->GetDisplayedHost(), mask2 = u2->nick + "!" + u2->GetIdent() + "@" + u2->host, mask3 = u2->nick + "!" + u2->GetIdent() + "@" + u2->ip.addr(); - if (!Anope::Match(mask, pattern) && !Anope::Match(mask2, pattern) && !Anope::Match(mask3, pattern)) + Anope::string mask = u2->nick + "!" + u2->GetIdent() + "@" + u2->GetDisplayedHost(), + mask2 = u2->nick + "!" + u2->GetIdent() + "@" + u2->host, + mask3 = u2->nick + "!" + u2->GetIdent() + "@" + u2->ip.addr(); + + if (!Anope::Match(mask, pattern, false, true) + && !Anope::Match(mask2, pattern, false, true) + && !Anope::Match(mask3, pattern, false, true)) continue; if (!modes.empty()) for (std::set<Anope::string>::iterator mit = modes.begin(), mit_end = modes.end(); mit != mit_end; ++mit) |