commit a98bbc8e0b937f4fedf7ad852eaf109c6a9c5b8f from: Federico G. Schwindt date: Thu Sep 05 16:31:56 2013 UTC Correct numeric returned by whois As per RFC whois should return 431 if no nick is provided. While here convert upper check to use irc-macros. As a bonus we get to set the penalty for free. commit - 9f74c0ff075dc67e068b8c2da0c069b6c622e436 commit + a98bbc8e0b937f4fedf7ad852eaf109c6a9c5b8f blob - 3d77237f4e08f95928d826462734dafc3f19e759 blob + 6013fa0c1bff4a6640a096a7fbb729c16fcbb335 --- src/ngircd/irc-info.c +++ src/ngircd/irc-info.c @@ -1211,11 +1211,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) IRC_SetPenalty(Client, 1); - /* Bad number of parameters? */ - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + /* Wrong number of parameters? */ + if (Req->argc < 1) + return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG, + Client_ID(Client)); + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) /* Get target server for this command */