pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-07 02:03:15 +02:00
Code Activity

Rewrote the config reader to better handle invalid configs.

Browse Source 
This prevents Anope from exploding when /os reload has errors.
This commit is contained in:
Adam
2010-08-17 19:27:37 -04:00
parent 2575008baa
commit e65d8b2f3d
195 changed files with 3133 additions and 3249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/os_svsnick.cpp
+12 -12
View File
@@ -29,35 +29,35 @@ class CommandOSSVSNick : public Command
NickAlias *na;
/* Truncate long nicknames to NICKMAX-2 characters */
if (newnick.length() > Config.NickLen)
if (newnick.length() > Config->NickLen)
{
notice_lang(Config.s_OperServ, u, NICK_X_TRUNCATED, newnick.c_str(), Config.NickLen, newnick.c_str());
newnick = params[1].substr(0, Config.NickLen);
notice_lang(Config->s_OperServ, u, NICK_X_TRUNCATED, newnick.c_str(), Config->NickLen, newnick.c_str());
newnick = params[1].substr(0, Config->NickLen);
}
/* Check for valid characters */
if (newnick[0] == '-' || isdigit(newnick[0]))
{
notice_lang(Config.s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str());
notice_lang(Config->s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str());
return MOD_CONT;
}
for (unsigned i = 0, end = newnick.length(); i < end; ++i)
if (!isvalidnick(newnick[i]))
{
notice_lang(Config.s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str());
notice_lang(Config->s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str());
return MOD_CONT;
}
/* Check for a nick in use or a forbidden/suspended nick */
if (!(u2 = finduser(nick)))
notice_lang(Config.s_OperServ, u, NICK_X_NOT_IN_USE, nick.c_str());
notice_lang(Config->s_OperServ, u, NICK_X_NOT_IN_USE, nick.c_str());
else if (finduser(newnick))
notice_lang(Config.s_OperServ, u, NICK_X_IN_USE, newnick.c_str());
notice_lang(Config->s_OperServ, u, NICK_X_IN_USE, newnick.c_str());
else if ((na = findnick(newnick)) && na->HasFlag(NS_FORBIDDEN))
notice_lang(Config.s_OperServ, u, NICK_X_FORBIDDEN, newnick.c_str());
notice_lang(Config->s_OperServ, u, NICK_X_FORBIDDEN, newnick.c_str());
else
{
notice_lang(Config.s_OperServ, u, OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str());
notice_lang(Config->s_OperServ, u, OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str());
ircdproto->SendGlobops(OperServ, "%s used SVSNICK to change %s to %s", u->nick.c_str(), nick.c_str(), newnick.c_str());
ircdproto->SendForceNickChange(u2, newnick, time(NULL));
}
@@ -66,18 +66,18 @@ class CommandOSSVSNick : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_OperServ, u, OPER_HELP_SVSNICK);
notice_help(Config->s_OperServ, u, OPER_HELP_SVSNICK);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX);
syntax_error(Config->s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_SVSNICK);
notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SVSNICK);
}
};