Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2005-12-13 23:12:51 UTC
Modified files:
Tag: u2_10_12_branch
ChangeLog doc/example.conf ircd/convert-conf.c ircd/ircd_parser.y
Log message:
Minor config file fixes (example, conversion, and error reporting).
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.44 ircu2.10/ChangeLog:1.710.2.45
--- ircu2.10/ChangeLog:1.710.2.44 Sun Nov 27 18:23:04 2005
+++ ircu2.10/ChangeLog Tue Dec 13 15:12:40 2005
@@ -1,3 +1,12 @@
+2005-12-13 Michael Poole <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* ircd/Makefile.in (version.c): version.c also depends on
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.61.2.3 ircu2.10/doc/example.conf:1.61.2.4
--- ircu2.10/doc/example.conf:1.61.2.3 Thu Nov 17 18:27:49 2005
+++ ircu2.10/doc/example.conf Tue Dec 13 15:12:41 2005
@@ -158,11 +158,6 @@
maxlinks = 100;
usermode = "+iw";
};
-Client
-{
- class = "Other";
- username = "*";
-};
Class {
name = "America";
pingfreq = 1 minutes 30 seconds;
Index: ircu2.10/ircd/convert-conf.c
diff -u ircu2.10/ircd/convert-conf.c:1.2.2.2
ircu2.10/ircd/convert-conf.c:1.2.2.3
--- ircu2.10/ircd/convert-conf.c:1.2.2.2 Sat Nov 19 15:52:54 2005
+++ ircu2.10/ircd/convert-conf.c Tue Dec 13 15:12:41 2005
@@ -421,7 +421,7 @@
}
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");
Index: ircu2.10/ircd/ircd_parser.y
diff -u ircu2.10/ircd/ircd_parser.y:1.56.2.1
ircu2.10/ircd/ircd_parser.y:1.56.2.2
--- ircu2.10/ircd/ircd_parser.y:1.56.2.1 Wed Oct 5 17:37:31 2005
+++ ircu2.10/ircd/ircd_parser.y Tue Dec 13 15:12:41 2005
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
- * $Id: ircd_parser.y,v 1.56.2.1 2005/10/06 00:37:31 entrope Exp $
+ * $Id: ircd_parser.y,v 1.56.2.2 2005/12/13 23:12:41 entrope Exp $
*/
%{
@@ -743,7 +743,7 @@
{
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 ';'
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
