From: Michael Poole <mdpoole@troilus.org>
Date: Fri, 10 Sep 2004 15:08:13 +0000 (+0000)
Subject: Make server blocks default to leaf.
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=f9c78674bc2f1a03cd9dd0c4316300fb03012b2e

Make server blocks default to leaf.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1107 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index 4641716..6dd1aed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2004-09-10  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/ircd_parser.y (serverblock): Server blocks should default
+	to CONF_LEAF status.
+
+	* doc/example.conf: Update example to reflect this.
+
 2004-09-10  Michael Poole <mdpoole@troilus.org>
 
 	* ircd/parse.c (msg_tree_parse): Reject commands that contain
-	non-alphanumeric characters.
+	non-alphabetic characters.
 
 2004-09-09  Michael Poole <mdpoole@troilus.org>
 
diff --git a/doc/example.conf b/doc/example.conf
index d6132af..c745f8a 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -381,8 +381,9 @@ motd {
 #  mask = "servermask";
 #  # No is assumed for these unless you set it to yes.
 #  uworld = no;
-#  leaf = no;
-#  hub = yes;
+#  hub = no;
+#  # Yes is assumed for "leaf" unless you set it to no.
+#  leaf = yes;
 # };
 #
 # Note: (1) These lines are agreed on by every server admin on Undernet;
diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index e1a0ace..31d3a16 100644
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -442,6 +442,7 @@ serverblock: SERVER
 {
  aconf = (struct ConfItem*) MyMalloc(sizeof(*aconf));
  memset(aconf, 0, sizeof(*aconf));
+ aconf->status = CONF_LEAF;
 } '{' serveritems '}'
 {
  if (aconf->status == 0)