From 8ec53c6a77f088a7331643179c85289b4561deb1 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Tue, 13 Dec 2005 23:12:41 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ doc/example.conf | 5 ----- ircd/convert-conf.c | 2 +- ircd/ircd_parser.y | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e38746a..ecf4f4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-12-13 Michael Poole + + * 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 * ircd/Makefile.in (version.c): version.c also depends on diff --git a/doc/example.conf b/doc/example.conf index 556ebb9..be3d13c 100644 --- 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 dbf4d58..0ff07d1 100644 --- 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 c8a9048..bd86914 100644 --- 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 ';' -- 2.20.1