commit - 12c60a670efe2a3270e7385c7358e87770562c95
commit + 4d0069c3a8021c32b5bdeeec57f1d41d369587ce
blob - f383dacd2c58a39aa4486555e8430fa2b4095cb7
blob + a248e8a69b106fc31bd72c0b08d4c7789b5d175f
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -1106,6 +1106,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE
 	if (Conn_UsesSSL(Client_Conn(c)) &&
 	    !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from),
 				Client_ID(c)))
+		return DISCONNECTED;
+
+	/* Registered nick name? */
+	if (Client_HasMode(c, 'R') &&
+	    !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG,
+				Client_ID(from), Client_ID(c)))
 		return DISCONNECTED;
 
 	/* Idle and signon time (local clients only!) */
blob - c5d833671c3f882973d1a9ce186ef1adec8145fa
blob + 0070e70159f46bd533624e953225854e23975812
--- src/ngircd/messages.h
+++ src/ngircd/messages.h
@@ -56,6 +56,7 @@
 #define RPL_ISON_MSG			"303 %s :"
 #define RPL_UNAWAY_MSG			"305 %s :You are no longer marked as being away"
 #define RPL_NOWAWAY_MSG			"306 %s :You have been marked as being away"
+#define RPL_WHOISREGNICK_MSG		"307 %s %s :is a registered nick"
 #define RPL_WHOISUSER_MSG		"311 %s %s %s %s * :%s"
 #define RPL_WHOISSERVER_MSG		"312 %s %s %s :%s"
 #define RPL_WHOISOPERATOR_MSG		"313 %s %s :is an IRC operator"