Commit Diff

Commit:
f8f7f83f5a2228bb9deeb8324be015cd76b84ced
From:
Alexander Barton <alex@barton.de>
Date:
Message:
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
Actions:
Patch | Tree
commit - 1136b9769099e8e163fabbf68fd07f0db086398e
commit + f8f7f83f5a2228bb9deeb8324be015cd76b84ced
blob - 0d57f902d46c4b5a0fb5f8cc3651a4030694554b
blob + bde91b1073199d27d3740459208fe20d1f3a3f9e
--- man/ngircd.conf.5.tmpl
+++ man/ngircd.conf.5.tmpl
@@ -291,8 +291,9 @@ Default: none.
 .TP
 \fBMorePrivacy\fR (boolean)
 This will cause ngIRCd to censor user idle time, logon time as well as the
-part/quit messages (that are sometimes used to inform everyone about which
-client software is being used). WHOWAS requests are also silently ignored.
+PART/QUIT messages (that are sometimes used to inform everyone about which
+client software is being used). WHOWAS requests are also silently ignored,
+and NAMES output doesn't list any clients for non-members.
 This option is most useful when ngIRCd is being used together with
 anonymizing software such as TOR or I2P and one does not wish to make it
 too easy to collect statistics on the users.
blob - aa4abe3d17afdc49ab2239421661a924df82b168
blob + c7a3e1b31e7f8b81e79f8d8854446965fb0f3351
--- src/ngircd/irc-channel.c
+++ 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,
blob - ba7a2b74243cd4cc21bfc8917510502104387d5a
blob + 1bbaf57b3b53a35e905be647c5f075690ade38ac
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -407,7 +407,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE
 
 	/* 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),