Allow more than one _functioning_ name= in a UWorld block.

[ircu2.10.12-pk.git] / ircd / ircd_parser.y

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 1c65d657078901718ed293b2a0d315c2c23564cf..d2f37632723716f8852c22271b81fd4a974a85b2 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -471,26 +471,14 @@ connectmaxhops: MAXHOPS '=' expr ';'
   maxlinks = $3;
 };
 
-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 ';'
 {
- MyFree(name);
- DupString(name, $3);
+ struct ConfItem *aconf;
+ aconf = make_conf(CONF_UWORLD);
+ DupString(aconf->host, $3);
 };
 
 operblock: OPER '{' operitems '}' ';'