git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1378
c9e4aea6-c8fd-4c43-8297-
357d70d61c8c
+2005-04-23 Michael Poole <mdpoole@troilus.org>
+
+ * doc/example.conf (UWorld): Illustrate new config extension.
+
+ * ircd/ircd_parser.y (uworldblock): Do the expected thing when
+ multiple name= entries are present.
+
2005-04-22 Michael Poole <mdpoole@troilus.org>
* RELEASE.NOTES: Silence exceptions use ~, not -. Oops!
2005-04-22 Michael Poole <mdpoole@troilus.org>
* RELEASE.NOTES: Silence exceptions use ~, not -. Oops!
# name = "relservername";
# };
#
# name = "relservername";
# };
#
+# You may have have more than one name listed in each block.
+#
# Note: (1) These lines are agreed on by every server admin on Undernet;
# (2) These lines must be the same on every single server, or results
# will be disasterous; (3) This is a useful feature, not something that
# Note: (1) These lines are agreed on by every server admin on Undernet;
# (2) These lines must be the same on every single server, or results
# will be disasterous; (3) This is a useful feature, not something that
UWorld {
name = "uworld.eu.undernet.org";
UWorld {
name = "uworld.eu.undernet.org";
name = "uworld2.undernet.org";
name = "uworld2.undernet.org";
name = "uworld.undernet.org";
name = "uworld.undernet.org";
name = "channels.undernet.org";
name = "channels.undernet.org";
name = "channels2.undernet.org";
name = "channels2.undernet.org";
name = "channels3.undernet.org";
name = "channels3.undernet.org";
name = "channels4.undernet.org";
name = "channels4.undernet.org";
name = "channels5.undernet.org";
name = "channels5.undernet.org";
name = "channels6.undernet.org";
};
name = "channels6.undernet.org";
};
-uworldblock: UWORLD '{' uworlditems '}' ';'
-{
- if (name)
- {
- struct ConfItem *aconf = make_conf(CONF_UWORLD);
- aconf->host = name;
- }
- else
- {
- MyFree(name);
- parse_error("Bad UWorld block");
- }
- name = NULL;
-};
+uworldblock: UWORLD '{' uworlditems '}' ';';
uworlditems: uworlditem uworlditems | uworlditem;
uworlditem: uworldname | error;
uworldname: NAME '=' QSTRING ';'
{
uworlditems: uworlditem uworlditems | uworlditem;
uworlditem: uworldname | error;
uworldname: NAME '=' QSTRING ';'
{
- MyFree(name);
- DupString(name, $3);
+ struct ConfItem *aconf;
+ aconf = make_conf(CONF_UWORLD);
+ DupString(aconf->host, $3);
};
operblock: OPER '{' operitems '}' ';'
};
operblock: OPER '{' operitems '}' ';'