Committer : isomer
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-02-19 22:11:49 UTC
Modified files:
ChangeLog ircd/ircd_parser.y
Log message:
Author: Perry Lorier <[EMAIL PROTECTED]>
Log message:
Moved the config to use parse_error() instead of log_write() so that ircd -k
shows the error. Also clarified the error message for missing classes in
oper blocks.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.556 ircu2.10/ChangeLog:1.557
--- ircu2.10/ChangeLog:1.556 Sat Feb 19 13:55:37 2005
+++ ircu2.10/ChangeLog Sat Feb 19 14:11:38 2005
@@ -1,5 +1,11 @@
2005-02-20 Perry Lorier <[EMAIL PROTECTED]>
+ * ircd/ircd_parser.y: Moved some parse errors from log_write()'s to
+ parse_error()'s so that ./ircd -k will display them. Also clarified
+ the warning about oper blocks.
+
+2005-02-20 Perry Lorier <[EMAIL PROTECTED]>
+
* tools/convert-conf.py: A multitude of changes to deal with parsing
mistakes, generate a newer config file, better error handling,
being smarter about what config elements you generate etc.
Index: ircu2.10/ircd/ircd_parser.y
diff -u ircu2.10/ircd/ircd_parser.y:1.38 ircu2.10/ircd/ircd_parser.y:1.39
--- ircu2.10/ircd/ircd_parser.y:1.38 Sat Feb 19 13:55:37 2005
+++ ircu2.10/ircd/ircd_parser.y Sat Feb 19 14:11:39 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.38 2005/02/19 21:55:37 entrope Exp $
+ * $Id: ircd_parser.y,v 1.39 2005/02/19 22:11:39 isomer Exp $
*/
%{
@@ -510,7 +510,7 @@
}
else
{
- log_write(LS_CONFIG, L_ERROR, 0, "operator blocks need a name, password,
and host.");
+ parse_error("operator blocks need a name, password, class and host.");
MyFree(name);
MyFree(pass);
MyFree(host);
@@ -890,8 +890,7 @@
{
if (qconf->chname == NULL || qconf->reason == NULL)
{
- log_write(LS_CONFIG, L_ERROR, 0, "quarantine blocks need a channel name "
- "and a reason.");
+ parse_error("quarantine blocks need a channel name and a reason.");
return 0;
}
qconf->next = GlobalQuarantineList;
@@ -916,7 +915,7 @@
{
if (!smap->name || !smap->services)
{
- log_write(LS_CONFIG, L_ERROR, 0, "pseudo commands need a service name and
list of target nicks.");
+ parse_error("pseudo commands need a service name and list of target
nicks.");
return 0;
}
if (register_mapping(smap))
@@ -971,7 +970,7 @@
} iauthitems '}' ';'
{
if (!host || !port) {
- log_write(LS_CONFIG, L_ERROR, 0, "IAuth block needs a server name and
port.");
+ parse_error("IAuth block needs a server name and port.");
return 0;
}
iauth_connect(host, port, pass, tconn, tping);
----------------------- End of diff -----------------------
