Make default virtual host work for .12, and make IPv4-only

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

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 5d66f9dd4767d1701702a46b29227ddeedda7bfd..3aa0afcad9c8b6fc5218b5eac54e0a0a7d8eae74 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -265,7 +265,13 @@ jupenick: NICK '=' QSTRING
   addNickJupes($3);
 } ';';
 
-generalblock: GENERAL '{' generalitems '}' ';' ;
+generalblock: GENERAL '{' generalitems '}'
+{
+  if (localConf.name == NULL)
+    parse_error("Your General block must contain a name.");
+  if (localConf.numeric == 0)
+    parse_error("Your General block must contain a numeric (between 1 and 4095).");
+} ';' ;
 generalitems: generalitem generalitems | generalitem;
 generalitem: generalnumeric | generalname | generalvhost | generaldesc | error;
 generalnumeric: NUMERIC '=' NUMBER ';'
@@ -295,7 +301,7 @@ generaldesc: DESCRIPTION '=' QSTRING ';'
 
 generalvhost: VHOST '=' QSTRING ';'
 {
-  ircd_aton(&localConf.vhost_address, $3);
+  ircd_aton(&VirtualHost.addr, $3);
 };
 
 adminblock: ADMIN '{' adminitems '}'