X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-info.c;h=54f83170e3bceea94828acb1baf83de868a43261;hp=4909a96a063a3a9940be0e52d9b9e070925a28c9;hb=48326e061aacd954e24f76c53ded10448cbc28eb;hpb=1f2aa4da6f62124bdbed4f2dce7e40ed4b411e2a

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 4909a96a..54f83170 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1150,17 +1150,25 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 				Client_ID(c)))
 		return DISCONNECTED;
 
-	/* Registered nick name? */
+	/* Registered nickname? */
 	if (Client_HasMode(c, 'R') &&
 	    !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG,
 				Client_ID(from), Client_ID(c)))
 		return DISCONNECTED;
 
-	if (Client_Conn(c) > NONE && (Client_OperByMe(from) || from == c) &&
-	    !IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, Client_ID(from),
-				Client_ID(c), Client_Hostname(c),
-				Conn_GetIPAInfo(Client_Conn(c))))
-		return DISCONNECTED;
+	/* Local client and requester is the user itself or an IRC Op? */
+	if (Client_Conn(c) > NONE &&
+	    (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) {
+		/* Client hostname */
+		if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
+		    Client_ID(from), Client_ID(c), Client_Hostname(c),
+		    Conn_GetIPAInfo(Client_Conn(c))))
+			return DISCONNECTED;
+		/* Client modes */
+		if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG,
+		    Client_ID(from), Client_ID(c), Client_Modes(c)))
+			return DISCONNECTED;
+	}
 
 	/* Idle and signon time (local clients only!) */
 	if (!Conf_MorePrivacy && Client_Conn(c) > NONE &&
@@ -1220,7 +1228,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 	/* Get target server for this command */
 	if (Req->argc > 1) {
 		/* Search the target server, which can be specified as a
-		 * nick name on that server as well: */
+		 * nickname on that server as well: */
 		target = Client_Search(Req->argv[0]);
 		if (!target)
 			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,