pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 05:26:38 +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/ns_identify.cpp
+18 -18
View File
@@ -31,36 +31,36 @@ class CommandNSIdentify : public Command
if (!(na = findnick(u->nick)))
{
if ((nr = findrequestnick(u->nick)))
notice_lang(Config.s_NickServ, u, NICK_IS_PREREG);
notice_lang(Config->s_NickServ, u, NICK_IS_PREREG);
else
notice_lang(Config.s_NickServ, u, NICK_NOT_REGISTERED);
notice_lang(Config->s_NickServ, u, NICK_NOT_REGISTERED);
}
else if (na->HasFlag(NS_FORBIDDEN))
notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str());
else if (na->nc->HasFlag(NI_SUSPENDED))
notice_lang(Config.s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str());
/* You can now identify for other nicks without logging out first,
* however you can not identify again for the group you're already
* identified as
*/
else if (u->Account() && u->Account() == na->nc)
notice_lang(Config.s_NickServ, u, NICK_ALREADY_IDENTIFIED);
notice_lang(Config->s_NickServ, u, NICK_ALREADY_IDENTIFIED);
else
{
res = enc_check_password(pass, na->nc->pass);
if (!res)
{
Alog() << Config.s_NickServ << ": Failed IDENTIFY for " << u->nick << "!" << u->GetIdent() << "@" << u->host;
notice_lang(Config.s_NickServ, u, PASSWORD_INCORRECT);
Alog() << Config->s_NickServ << ": Failed IDENTIFY for " << u->nick << "!" << u->GetIdent() << "@" << u->host;
notice_lang(Config->s_NickServ, u, PASSWORD_INCORRECT);
if (bad_password(u))
return MOD_STOP;
}
else if (res == -1)
notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_FAILED);
notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_FAILED);
else
{
if (u->IsIdentified())
Alog() << Config.s_NickServ << ": " << u->GetMask() << " logged out of account " << u->Account()->display;
Alog() << Config->s_NickServ << ": " << u->GetMask() << " logged out of account " << u->Account()->display;
na->last_realname = u->realname;
na->last_seen = time(NULL);
@@ -73,17 +73,17 @@ class CommandNSIdentify : public Command
FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u));
Alog() << Config.s_NickServ << ": " << u->GetMask() << " identified for account " << u->Account()->display;
notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_SUCCEEDED);
Alog() << Config->s_NickServ << ": " << u->GetMask() << " identified for account " << u->Account()->display;
notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_SUCCEEDED);
if (ircd->vhost)
do_on_id(u);
if (Config.NSModeOnID)
if (Config->NSModeOnID)
do_setmodes(u);
if (Config.NSForceEmail && u->Account() && u->Account()->email.empty())
if (Config->NSForceEmail && u->Account() && u->Account()->email.empty())
{
notice_lang(Config.s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED);
notice_help(Config.s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO);
notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED);
notice_help(Config->s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO);
}
if (u->IsIdentified())
@@ -95,19 +95,19 @@ class CommandNSIdentify : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_NickServ, u, NICK_HELP_IDENTIFY);
notice_help(Config->s_NickServ, u, NICK_HELP_IDENTIFY);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX);
syntax_error(Config->s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX);
}
void OnServHelp(User *u)
{
if (this->name.equals_ci("IDENTIFY"))
notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_IDENTIFY);
notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_IDENTIFY);
}
};