X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/88d08e8496c97ba4a451456deff902e6fd5d987b..d2d703a1d79dadd8459e7202a305279afc909f5e:/doc/reference.conf

diff --git a/doc/reference.conf b/doc/reference.conf
index 08d9508..f23050a 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -213,19 +213,19 @@ class "users" {
          */
         number_per_ip_global = 5;
 
-	/* cidr_bitlen:  Limits numbers of connections from a subnet size
+	/* cidr_ipv4_bitlen:  Limits numbers of connections from a subnet size
+	 */
+	cidr_ipv4_bitlen = 24;
+
+	/* cidr_ipv6_bitlen:  Limits numbers of connections from a subnet size
 	 * the following example makes the subnet /64 this is useful
 	 * for IPv6 connections in particular
-	 * Also note that the way charybdis is written if you have
-	 * compiled support for IPv6, IPv4 cidr bitlens need to be modified
-	 * Basically to get the approriate length add 96 to the IPv4 length
-	 * For example for a /24 do 96+24 = 120
-	 *
 	 */
-	cidr_bitlen = 64;
+	cidr_ipv6_bitlen = 64;
 
 	/* number_per_cidr:  Number of connections to allow from a subnet of the 
-	 * size given in cidr_bitlen.  4 seems to be a good default to me.
+	 * size given in cidr_ipv4_bitlen/cidr_ipv6_bitlen.
+	 * 4 seems to be a good default to me.
 	 */
 	number_per_cidr = 4;
 
@@ -401,7 +401,7 @@ privset "local_op" {
 privset "server_bot" {
 	/* extends: a privset to inherit in this privset */
 	extends = "local_op";
-	privs = oper:global_kill, oper:kline, oper:remoteban, snomask:nick_changes;
+	privs = oper:kline, oper:remoteban, snomask:nick_changes;
 };
 
 privset "global_op" {
@@ -733,6 +733,12 @@ channel {
 	 * ratbox-services does.
 	 */
 	kick_on_split_riding = no;
+
+	/* only ascii channels: disable local users joining channels
+	 * containing characters outside the range 33-126 (non-printable
+	 * or non-ASCII).
+	 */
+	only_ascii_channels = no;
 };