diff options
| author | Alexander Barton <alex@barton.de> | 2015-05-13 22:42:51 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2015-05-13 22:42:51 +0200 |
| commit | f8f7f83f5a2228bb9deeb8324be015cd76b84ced (patch) | |
| tree | d3d108ba6f795d88e0646cea6397aae4d16513d3 /src | |
| parent | 1136b9769099e8e163fabbf68fd07f0db086398e (diff) | |
| download | ngircd-f8f7f83f5a2228bb9deeb8324be015cd76b84ced.tar.gz ngircd-f8f7f83f5a2228bb9deeb8324be015cd76b84ced.zip | |
Streamline effect of "MorePrivacy" option (WHOIS, LIST)
- Update documentation in ngircd.conf(5) - LIST: Don't hide channels for IRC Ops when "MorePrivacy" is in effect - WHOIS: Don't hide IP addresses/hostnames when "MorePrivacy" is in effect Closes #198
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/irc-channel.c | 4 | ||||
| -rw-r--r-- | src/ngircd/irc-info.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index aa4abe3d..c7a3e1b3 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -608,9 +608,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Gotcha! */ if (!Channel_HasMode(chan, 's') || Channel_IsMemberOf(chan, from) - || (!Conf_MorePrivacy - && Client_HasMode(Client, 'o') - && Client_Conn(Client) > NONE)) + || Client_HasMode(from, 'o')) { if ((Conf_MaxListSize > 0) && IRC_CheckListTooBig(from, count, diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index ba7a2b74..1bbaf57b 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -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), |