Patch attached, removes the warnings when doing a /rehash and
servername/numeric have not changed.  Will still error warnings when
they have changed.

Gavin Grieve

diff -r -u ircu2.10.12/ChangeLog ircu2.10.12.hek/ChangeLog
--- ircu2.10.12/ChangeLog       2004-04-02 22:26:07.000000000 +1200
+++ ircu2.10.12.hek/ChangeLog   2004-04-02 22:29:29.000000000 +1200
@@ -1,3 +1,8 @@
+2004-04-02  Gavin Grieve <[EMAIL PROTECTED]>
+
+       * ircd/ircd_parser.y: Fix rehash warnings for servername and numeric
+         so they only warn if changed in the config file.
+
 2004-01-20  Perry Lorier <[EMAIL PROTECTED]>

        * ircd/ircd_parser.y: Fixed parser to work with a more modern bison
diff -r -u ircu2.10.12/ircd/ircd_parser.y ircu2.10.12.hek/ircd/ircd_parser.y
--- ircu2.10.12/ircd/ircd_parser.y      2004-01-25 14:41:21.000000000 +1300
+++ ircu2.10.12.hek/ircd/ircd_parser.y  2004-04-02 22:22:24.000000000 +1200
@@ -263,7 +263,7 @@
 {
   if (localConf.numeric == 0)
     localConf.numeric = yylval.num;
-  else
+  else if (localConf.numeric != yylval.num)
     parse_error("Redefinition of server numeric %i (%i)",yylval.num,
                localConf.numeric);
 };
@@ -272,7 +272,7 @@
 {
   if (localConf.name == NULL)
     DupString(localConf.name, yylval.text);
-  else
+  else if ( strcmp(localConf.name, yylval.text) )
     parse_error("Redefinition of server name %s (%s)",yylval.text,
                localConf.name);
 };

Reply via email to