Commit Diff

Commit:
566a451299cab41810bafc5ed11a5021e30d9b3d
From:
Alexander Barton <alex@barton.de>
Date:
Message:
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.
Actions:
Patch | Tree
commit - e0f8ce093ad2cc389fe8ffd404addaf609451b3f
commit + 566a451299cab41810bafc5ed11a5021e30d9b3d
blob - 5e56949f553b92d1ed3154863313bd3700b56668
blob + c2f4910e47645807251c82e9815e61ccdbc08279
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -1109,8 +1109,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE
 				    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 */