Module: ngircd.git Branch: master Commit: 9fbf592924d4ed1e37b42f295ec9c9ab0fc3cd08 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9fbf5...

Author: Alexander Barton alex@barton.de Date: Thu Jan 5 00:51:39 2012 +0100

WHOIS command: make sure matching is case-insensitive

And make sure that RPL_ENDOFWHOIS replies with the unmodified mask like it has been received from the client.

---

src/ngircd/irc-info.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 883893f..42b2264 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1129,7 +1129,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) unsigned int match_count = 0, found = 0; bool has_wildcards, is_remote; bool got_wildcard = false; - const char *query; + char mask[COMMAND_LEN], *query;

assert( Client != NULL ); assert( Req != NULL ); @@ -1170,7 +1170,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) Req->argv[0], Req->argv[1]);

is_remote = Client_Conn(from) < 0; - for (query = strtok(Req->argv[Req->argc - 1], ","); + strlcpy(mask, Req->argv[Req->argc - 1], sizeof(mask)); + for (query = strtok(ngt_LowerStr(mask), ","); query && found < 3; query = strtok(NULL, ","), found++) {