From d01f4ea3ce7ff16409e9c21f0a6426958da40462 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 4 Nov 2011 18:04:12 -0400 Subject: [PATCH] Allow /os userlist to match host and ip too --- modules/commands/os_list.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp index 45179a427..ccca1a617 100644 --- a/modules/commands/os_list.cpp +++ b/modules/commands/os_list.cpp @@ -137,8 +137,8 @@ class CommandOSUserList : public Command if (!pattern.empty()) { - Anope::string mask = u2->nick + "!" + u2->GetIdent() + "@" + u2->GetDisplayedHost(); - if (!Anope::Match(mask, pattern)) + Anope::string mask = u2->nick + "!" + u2->GetIdent() + "@" + u2->GetDisplayedHost(), mask2 = u2->nick + "!" + u2->GetIdent() + "@" + u2->host, mask3 = u2->nick + "!" + u2->GetIdent() + "@" + (u2->ip() ? u2->ip.addr() : u2->host); + if (!Anope::Match(mask, pattern) && !Anope::Match(mask2, pattern) && !Anope::Match(mask3, pattern)) continue; if (!Modes.empty()) for (std::list::iterator mit = Modes.begin(), mit_end = Modes.end(); mit != mit_end; ++mit)