Minor config file fixes (example, conversion, and error reporting).

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

diff --git a/ChangeLog b/ChangeLog
index e38746a031f76e7bcaaab2eb041fd6178db28a10..ecf4f4a90648300b8131ebb3c6a71a691da0f082 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-13  Michael Poole <mdpoole@troilus.org>
+
+       * doc/example.conf: Remove extraneous "Other" Client block.
+
+       * ircd/convert-conf.c (finish_operators): Fix operator precedence
+       bug.
+
+       * ircd/ircd_parser.y (clientclass): Fix typo in error message.
+
 2005-11-27  Michael Poole <mdpoole@troilus.org>
 
        * ircd/Makefile.in (version.c): version.c also depends on

diff --git a/doc/example.conf b/doc/example.conf
index 556ebb9df5b6b7fc963943a94fb54c56287fad44..be3d13c7c33e8e52ac50d3deb6872e1e8f5ba94b 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -158,11 +158,6 @@ Class {
  maxlinks = 100;
  usermode = "+iw";
 };
-Client
-{
- class = "Other";
- username = "*";
-};
 Class {
  name = "America";
  pingfreq = 1 minutes 30 seconds;

diff --git a/ircd/convert-conf.c b/ircd/convert-conf.c
index dbf4d58f948f93da2d1cf16765c298e05de5472b..0ff07d1b16f74e0e18b58ac8afd369a52aa2e84d 100644 (file)
--- a/ircd/convert-conf.c
+++ b/ircd/convert-conf.c
@@ -421,7 +421,7 @@ static void finish_operators(void)
         }
         for (ii = 0; (remap = &remapped_features[ii++])->name; ) {
             if (!remap->feature || !remap->privilege
-                || !remap->feature->values || !remap->flags & mask)
+                || !remap->feature->values || !(remap->flags & mask))
                 continue;
             fprintf(stdout, "\t%s = %s;\n", remap->privilege,
                     strcmp(remap->feature->values->value, "TRUE") ? "no" : "yes");

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index c8a9048f4b5d5e4a541101298a158caf560091ae..bd86914c884fc14a54c18130a45837dccd59457d 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -743,7 +743,7 @@ clientclass: CLASS '=' QSTRING ';'
 {
   c_class = find_class($3);
   if (!c_class)
-    parse_error("No such connection class '%s' for Class block", $3);
+    parse_error("No such connection class '%s' for Client block", $3);
   MyFree($3);
 };
 clientpass: PASS '=' QSTRING ';'