- Forward-port -r1774:

  - Configuration parser now does support 'year' and 'month' units
  - Add support for fake idle times to /whois. Known from csircd, this
    adds min_idle, and max_idle configuration directives to class{} blocks


git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1783 82007160-df01-0410-b94d-b575c5fd34c7

3 files changed, 46 insertions, 8 deletions

diff --git a/doc/example.conf b/doc/example.conf
index dc7671e..0255b37 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -1,5 +1,5 @@
 /* doc/example.conf - ircd-hybrid-8 Example configuration file
- * Copyright (C) 2000-2012 Hybrid Development Team
+ * Copyright (C) 2000-2013 Hybrid Development Team
  *
  * Written by ejb, wcampbel, db, leeh and others
  * Other example configurations can be found in the source dir under
@@ -24,7 +24,7 @@
  *        12 hours 30 minutes 1 second
  *        
  * Valid units of time:
- *        month, week, day, hour, minute, second
+ *        year, month, week, day, hour, minute, second
  *
  * Valid units of size:
  *        megabyte/mbyte/mb, kilobyte/kbyte/kb, byte
@@ -255,6 +255,25 @@ class {
 	number_per_ip = 10;
 	max_number = 100;
 	sendq = 100 kbytes;
+
+	/*
+	 * min_idle: minimum idle time that is shown in /whois
+	 */
+	min_idle = 3 hours;
+
+	/*
+	 * max_idle: maximum idle time that is shown in /whois
+	 */
+	max_idle = 8 hours;
+
+	/*
+	 * flags:
+	 *
+	 * random_idle          - idle time is randomly selected within the
+	 *                        range of min_idle to max_idle
+	 * hide_idle_from_opers - fake idle time will be shown to operators, too
+	 */
+	flags = random_idle, hide_idle_from_opers;
 };
 
 class {
@@ -882,7 +901,7 @@ serverhide {
 
 /*
  * general {}:  The general block contains many of the options that were once
- * compiled in options in config.h.  The general block is read at start time.
+ * compiled in options in config.h
  */
 general {
 	/* services_name: servername of nick/channel services */
diff --git a/doc/example.efnet.conf b/doc/example.efnet.conf
index fc8b2d6..cb7d4ac 100644
--- a/doc/example.efnet.conf
+++ b/doc/example.efnet.conf
@@ -1,5 +1,5 @@
 /* doc/example.efnet.conf - ircd-hybrid-8 EFnet Example configuration file
- * Copyright (C) 2000-2012 Hybrid Development Team
+ * Copyright (C) 2000-2013 Hybrid Development Team
  *
  * Written by ejb, wcampbel, db, leeh and others
  * Other example configurations can be found in the source dir under
@@ -24,7 +24,7 @@
  *        12 hours 30 minutes 1 second
  *        
  * Valid units of time:
- *        month, week, day, hour, minute, second
+ *        year, month, week, day, hour, minute, second
  *
  * Valid units of size:
  *        megabyte/mbyte/mb, kilobyte/kbyte/kb, byte
@@ -267,6 +267,25 @@ class {
 	number_per_ip = 10;
 	max_number = 100;
 	sendq = 1 mbyte;
+
+	/*
+	 * min_idle: minimum idle time that is shown in /whois
+	 */
+	min_idle = 3 hours;
+
+	/*
+	 * max_idle: maximum idle time that is shown in /whois
+	 */
+	max_idle = 8 hours;
+
+	/*
+	 * flags:
+	 *
+	 * random_idle          - idle time is randomly selected within the
+	 *                        range of min_idle to max_idle
+	 * hide_idle_from_opers - fake idle time will be shown to operators, too
+	 */
+	flags = random_idle, hide_idle_from_opers;
 };
 
 class {
@@ -905,7 +924,7 @@ serverhide {
 
 /*
  * general {}:  The general block contains many of the options that were once
- * compiled in options in config.h.  The general block is read at start time.
+ * compiled in options in config.h
  */
 general {
 	/* max_watch: maximum WATCH entries a client can have. */
diff --git a/doc/example.quick.conf b/doc/example.quick.conf
index 755a20c..45159de 100644
--- a/doc/example.quick.conf
+++ b/doc/example.quick.conf
@@ -1,5 +1,5 @@
 /* doc/example.conf.quick - ircd-hybrid-8 Example configuration file
- * Copyright (C) 2000-2012 Hybrid Development Team
+ * Copyright (C) 2000-2013 Hybrid Development Team
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
@@ -22,7 +22,7 @@
  *        12 hours 30 minutes 1 second
  *        
  * Valid units of time:
- *        month, week, day, hour, minute, second
+ *        year, month, week, day, hour, minute, second
  *
  * Valid units of size:
  *        megabyte/mbyte/mb, kilobyte/kbyte/kb, byte