Merge branch 'MorePrivacy'

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

diff --cc doc/sample-ngircd.conf.tmpl
Simple merge

diff --cc man/ngircd.conf.5.tmpl
Simple merge

diff --cc src/ngircd/conf.c
Simple merge

diff --cc src/ngircd/conf.h
index 1f9bd122d02faf311e64bcce5d527163147d8fe3,c2af692a63834b5a0153eec3ef0b64910dc8797e..afc0afaa96c712f1c78626160a26d3dab2750aaa
--- 1/src/ngircd/conf.h
--- 2/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)