From: Alexander Barton <alex@barton.de>
Date: Sun, 26 Jun 2011 13:41:27 +0000 (+0200)
Subject: Merge branch 'MorePrivacy'
X-Git-Tag: rel-18-rc1~5
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=d99edb7728e058a889e4734f8592f495effa5bc3

Merge branch 'MorePrivacy'

* MorePrivacy:
  New configuration opion "MorePrivacy" to "censor" some user information
---

d99edb7728e058a889e4734f8592f495effa5bc3
diff --cc src/ngircd/conf.h
index 1f9bd122,c2af692a..afc0afaa
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@@ -175,15 -175,15 +175,18 @@@ GLOBAL bool Conf_DNS
  /** Enable IDENT lookups, even when compiled with support for it */
  GLOBAL bool Conf_Ident;
  
 -/** Enable all usage of PAM, even when compiled with support for it */
 -GLOBAL bool Conf_PAM;
 -
+ /** Enable "more privacy" mode and "censor" some user-related information */
+ GLOBAL bool Conf_MorePrivacy;
+ 
+ /** Enable NOTICE AUTH messages on connect */
+ GLOBAL bool Conf_NoticeAuth;
+ 
 +/** Enable all usage of PAM, even when compiled with support for it */
 +GLOBAL bool Conf_PAM;
 +
 +/** Disable all CTCP commands except for /me ? */
 +GLOBAL bool Conf_ScrubCTCP;
 +
- /** Enable NOTICE AUTH messages on connect */
- GLOBAL bool Conf_NoticeAuth;
- 
  /*
   * try to connect to remote systems using the ipv6 protocol,
   * if they have an ipv6 address? (default yes)