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 &&
/* 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,