"WHO <hostmask>": use displayed hostname for matching

[ngircd-alex.git] / src / ngircd / irc-info.c

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index aaa607ddf32d5248c9b1cdd0c41ea5944da4a796..f9c9b0d2423c97b2ed8e2bf596a5f56fa1efa3ca 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -951,7 +951,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
                if (Mask) {
                        /* Match pattern against user host/server/name/nick */
                        client_match = MatchCaseInsensitive(Mask,
-                                               Client_Hostname(c));
+                                               Client_HostnameDisplayed(c));
                        if (!client_match)
                                client_match = MatchCaseInsensitive(Mask,
                                                Client_ID(Client_Introducer(c)));
@@ -1133,14 +1133,20 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                        return DISCONNECTED;
        }
 
+       /* Service? */
+       if (Client_Type(c) == CLIENT_SERVICE &&
+           !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG,
+                               Client_ID(from), Client_ID(c)))
+               return DISCONNECTED;
+
        /* IRC-Operator? */
-       if (Client_HasMode(c, 'o') &&
+       if (Client_HasMode(c, 'o') && Client_Type(c) != CLIENT_SERVICE &&
            !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
                                Client_ID(from), Client_ID(c)))
                return DISCONNECTED;
 
        /* IRC-Bot? */
-       if (Client_HasMode(c, 'B') &&
+       if (Client_HasMode(c, 'B') && Client_Type(c) != CLIENT_SERVICE &&
            !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG,
                                Client_ID(from), Client_ID(c)))
                return DISCONNECTED;
@@ -1262,7 +1268,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                 */
                if (!has_wildcards || is_remote) {
                        c = Client_Search(query);
-                       if (c && Client_Type(c) == CLIENT_USER) {
+                       if (c && (Client_Type(c) == CLIENT_USER
+                                 || Client_Type(c) == CLIENT_SERVICE)) {
                                if (!IRC_WHOIS_SendReply(Client, from, c))
                                        return DISCONNECTED;
                        } else {