]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-info.c
First check if channel has mode "N", then check membership
[ngircd-alex.git] / src / ngircd / irc-info.c
index e261b7f68874940e80f8f8676269299d704134e1..1bbaf57b3b53a35e905be647c5f075690ade38ac 100644 (file)
@@ -327,12 +327,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 
                        /* Secret channel? */
                        if (Channel_HasMode(chan, 's')
-                               && !Channel_IsMemberOf(chan, Client))
+                           && !Channel_IsMemberOf(chan, Client))
                                continue;
 
                        /* Local channel and request is not from a user? */
                        if (Client_Type(Client) == CLIENT_SERVER
-                               && Channel_IsLocal(chan))
+                           && Channel_IsLocal(chan))
                                continue;
 
                        /* Concatenate channel names */
@@ -340,7 +340,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                                strlcat(str, " ", sizeof(str));
 
                        who_flags_qualifier(Client, Channel_UserModes(chan, c),
-                                               str, sizeof(str));
+                                           str, sizeof(str));
                        strlcat(str, Channel_Name(chan), sizeof(str));
 
                        if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {
@@ -407,7 +407,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 
        /* 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')))) {
+           (from == c || Client_HasMode(from, 'o'))) {
                /* Client hostname */
                if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
                                        Client_ID(from), Client_ID(c),