RPL_ISUPPORT (numeric 005): Report MODES=<MAX_CMODES_ARG>

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

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index c2f4910e47645807251c82e9815e61ccdbc08279..c2412651121a69220a407d60f850d9c4ef4048b0 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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++)
        {
@@ -1185,7 +1186,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                 */
                if (!has_wildcards || is_remote) {
                        c = Client_Search(query);
-                       if (c) {
+                       if (c && Client_Type(c) == CLIENT_USER) {
                                if (!IRC_WHOIS_SendReply(Client, from, c))
                                        return DISCONNECTED;
                        } else {
@@ -1567,7 +1568,7 @@ IRC_Send_ISUPPORT(CLIENT * Client)
        return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client),
                                  CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1,
                                  COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1,
-                                 COMMAND_LEN - 113);
+                                 COMMAND_LEN - 113, MAX_CMODES_ARG);
 } /* IRC_Send_ISUPPORT */