}
+/**
+ * Return channel user mode prefix(es).
+ *
+ * @param Client The client requesting the mode prefixes.
+ * @param chan_user_modes String with channel user modes.
+ * @param str String buffer to which the prefix(es) will be appended.
+ * @param len Size of "str" buffer.
+ * @return Pointer to "str".
+ */
static char *
-who_flags_qualifier(CLIENT *Client, const char *chan_user_modes, char *str, size_t len)
+who_flags_qualifier(CLIENT *Client, const char *chan_user_modes,
+ char *str, size_t len)
{
assert(Client != NULL);
bool is_visible, is_member, is_ircop;
CL2CHAN *cl2chan;
const char *client_modes;
- const char *chan_user_modes;
char flags[10];
CLIENT *c;
int count = 0;
if (is_ircop)
strlcat(flags, "*", sizeof(flags));
- chan_user_modes = Channel_UserModes(Chan, c);
- who_flags_qualifier(c, chan_user_modes, flags, sizeof(flags));
+ who_flags_qualifier(Client, Channel_UserModes(Chan, c),
+ flags, sizeof(flags));
if (!write_whoreply(Client, c, Channel_Name(Chan),
flags))
if (str[strlen(str) - 1] != ':')
strlcat(str, " ", sizeof(str));
- who_flags_qualifier(c, Channel_UserModes(chan, c), str, sizeof(str));
+ who_flags_qualifier(Client, Channel_UserModes(chan, c),
+ str, sizeof(str));
strlcat(str, Channel_Name(chan), sizeof(str));
if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) {
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,
if (str[strlen(str) - 1] != ':')
strlcat(str, " ", sizeof(str));
- who_flags_qualifier(cl, Channel_UserModes(Chan, cl), str, sizeof(str));
+ who_flags_qualifier(Client, Channel_UserModes(Chan, cl),
+ str, sizeof(str));
strlcat(str, Client_ID(cl), sizeof(str));
if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {