repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 566a451299cab41810bafc5ed11a5021e30d9b3d:
path_to: 
revision_to: 

commit 566a451299cab41810bafc5ed11a5021e30d9b3d
Author: Alexander Barton 
Date:   Thu Jan 5 00:22:57 2012 +0100

    WHOIS command: make sure the reply ends with RPL_ENDOFWHOIS

    Up to now, each reply for itself ended in RPL_ENDOFWHOIS and queries
    for unknown nick names lacked the RPL_ENDOFWHOIS -- both is wrong.

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c

--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1109,8 +1109,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 				    Client_Away(c)))
 			return DISCONNECTED;

-	return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG,
-				  Client_ID(from), Client_ID(c));
+	return CONNECTED;
 } /* IRC_WHOIS_SendReply */


@@ -1219,10 +1218,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 		}

 		if (match_count == 0)
-			return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-				Client_ID(Client), Req->argv[Req->argc - 1]);
+			IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					   Client_ID(Client),
+					   Req->argv[Req->argc - 1]);
 	}
-	return CONNECTED;
+	return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG,
+				  Client_ID(from), Req->argv[Req->argc - 1]);
 } /* IRC_WHOIS */

-----END OF PAGE-----