From b0dc8e031c93374c092f50bb2073dc42a4a5cdce Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Wed, 29 Aug 2007 15:04:45 -0700
Subject: [PATCH] [svn] Clarify format of IPv6 addresses in auth{} and
 connect{}.

---
 ChangeLog          |  9 +++++++++
 doc/example.conf   | 12 ++++++++----
 doc/reference.conf | 13 ++++++++++---
 include/serno.h    |  2 +-
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 115373a..c57857a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/08/23 21:02:31 UTC	(20070823-3560)
+  Log:
+  Add more information about invitations and invexes.
+  
+
+  Changes:	Modified:
+  +7 -1		trunk/doc/sgml/oper-guide/cmodes.sgml (File Modified) 
+
+
 jilles      2007/08/23 19:00:10 UTC	(20070823-3558)
   Log:
   Add what /invite actually does (bypass +ijlr).
diff --git a/doc/example.conf b/doc/example.conf
index c3d5e65..d68311d 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
  * Copyright (C) 2002-2005 ircd-ratbox development team
  * Copyright (C) 2005-2006 charybdis development team
  *
- * $Id: example.conf 3550 2007-08-09 06:47:26Z nenolod $
+ * $Id: example.conf 3562 2007-08-29 22:04:45Z jilles $
  *
  * See reference.conf for more information.
  */
@@ -116,8 +116,11 @@ listen {
  * then general access, then restricted.
  */
 auth {
-	/* user: the user@host allowed to connect.  multiple IPv4/IPv6 user 
-	 * lines are permitted per auth block.
+	/* user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
+	 * lines are permitted per auth block.  This is matched against the
+	 * hostname and IP address (using :: shortening for IPv6 and
+	 * prepending a 0 if it starts with a colon) and can also use CIDR
+	 * masks.
 	 */
 	user = "*@172.16.0.0/12";
 	user = "*test@123D:B567:*";
@@ -242,7 +245,8 @@ connect "irc.uplink.com" {
 	class = "server";
 	flags = compressed, topicburst;
 
-	/* If the connection is IPv6, uncomment below */
+	/* If the connection is IPv6, uncomment below.
+	 * Use 0::1, not ::1, for IPv6 localhost. */
 	#aftype = ipv6;
 };
 
diff --git a/doc/reference.conf b/doc/reference.conf
index 6241d31..ecf4f67 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: reference.conf 3550 2007-08-09 06:47:26Z nenolod $
+ * $Id: reference.conf 3562 2007-08-29 22:04:45Z jilles $
  */
 
 /* IMPORTANT NOTES:
@@ -261,8 +261,11 @@ listen {
 
 /* auth {}: allow users to connect to the ircd (OLD I:) */
 auth {
-	/* user: the user@host allowed to connect.  multiple IPv4/IPv6 user 
-	 * lines are permitted per auth block.
+	/* user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
+	 * lines are permitted per auth block.  This is matched against the
+	 * hostname and IP address (using :: shortening for IPv6 and
+	 * prepending a 0 if it starts with a colon) and can also use CIDR
+	 * masks.
 	 */
 	user = "*@172.16.0.0/12";
 	user = "*test@123D:B567:*";
@@ -445,6 +448,10 @@ connect "irc.uplink.com" {
 };
 
 connect "ipv6.some.server" {
+	/* Hosts that are IPv6 addresses must be in :: shortened form
+	 * if applicable.  Addresses starting with a colon get an extra
+	 * zero prepended, for example: 0::1
+	 */
         host = "3ffd:dead:beef::1";
         send_password = "password";
         accept_password = "password";
diff --git a/include/serno.h b/include/serno.h
index 12943d1..2640e86 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070823-3558"
+#define SERNO "20070823-3560"