Rewrote the config reader to better handle invalid configs.

This prevents Anope from exploding when /os reload has errors.

1 files changed, 21 insertions, 21 deletions

diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp
index b8107e08a..e2f4befdf 100644
--- a/modules/core/ns_recover.cpp
+++ b/modules/core/ns_recover.cpp
@@ -29,35 +29,35 @@ class CommandNSRecover : public Command
 		User *u2;
 
 		if (!(u2 = finduser(nick)))
-			notice_lang(Config.s_NickServ, u, NICK_X_NOT_IN_USE, nick.c_str());
+			notice_lang(Config->s_NickServ, u, NICK_X_NOT_IN_USE, nick.c_str());
 		else if (!(na = findnick(u2->nick)))
-			notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str());
+			notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str());
 		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());
 		else if (nick.equals_ci(u->nick))
-			notice_lang(Config.s_NickServ, u, NICK_NO_RECOVER_SELF);
+			notice_lang(Config->s_NickServ, u, NICK_NO_RECOVER_SELF);
 		else if (!pass.empty())
 		{
 			int res = enc_check_password(pass, na->nc->pass);
 
 			if (res == 1)
 			{
-				notice_lang(Config.s_NickServ, u2, FORCENICKCHANGE_NOW);
+				notice_lang(Config->s_NickServ, u2, FORCENICKCHANGE_NOW);
 				u2->Collide(na);
 
-				/* Convert Config.NSReleaseTimeout seconds to string format */
-				Anope::string relstr = duration(na->nc, Config.NSReleaseTimeout);
+				/* Convert Config->NSReleaseTimeout seconds to string format */
+				Anope::string relstr = duration(na->nc, Config->NSReleaseTimeout);
 
-				notice_lang(Config.s_NickServ, u, NICK_RECOVERED, Config.s_NickServ.c_str(), nick.c_str(), relstr.c_str());
+				notice_lang(Config->s_NickServ, u, NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
 			}
 			else
 			{
-				notice_lang(Config.s_NickServ, u, ACCESS_DENIED);
+				notice_lang(Config->s_NickServ, u, ACCESS_DENIED);
 				if (!res)
 				{
-					Alog() << Config.s_NickServ << ": RECOVER: invalid password for " << nick << " by " << u->GetMask();
+					Alog() << Config->s_NickServ << ": RECOVER: invalid password for " << nick << " by " << u->GetMask();
 					if (bad_password(u))
 						return MOD_STOP;
 				}
@@ -67,38 +67,38 @@ class CommandNSRecover : public Command
 		{
 			if (u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc)))
 			{
-				notice_lang(Config.s_NickServ, u2, FORCENICKCHANGE_NOW);
+				notice_lang(Config->s_NickServ, u2, FORCENICKCHANGE_NOW);
 				u2->Collide(na);
 
-				/* Convert Config.NSReleaseTimeout seconds to string format */
-				Anope::string relstr = duration(na->nc, Config.NSReleaseTimeout);
+				/* Convert Config->NSReleaseTimeout seconds to string format */
+				Anope::string relstr = duration(na->nc, Config->NSReleaseTimeout);
 
-				notice_lang(Config.s_NickServ, u, NICK_RECOVERED, Config.s_NickServ.c_str(), nick.c_str(), relstr.c_str());
+				notice_lang(Config->s_NickServ, u, NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str());
 			}
 			else
-				notice_lang(Config.s_NickServ, u, ACCESS_DENIED);
+				notice_lang(Config->s_NickServ, u, ACCESS_DENIED);
 		}
 		return MOD_CONT;
 	}
 
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
-		/* Convert Config.NSReleaseTimeout seconds to string format */
-		Anope::string relstr = duration(u->Account(), Config.NSReleaseTimeout);
+		/* Convert Config->NSReleaseTimeout seconds to string format */
+		Anope::string relstr = duration(u->Account(), Config->NSReleaseTimeout);
 
-		notice_help(Config.s_NickServ, u, NICK_HELP_RECOVER, relstr.c_str());
+		notice_help(Config->s_NickServ, u, NICK_HELP_RECOVER, relstr.c_str());
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		syntax_error(Config.s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX);
+		syntax_error(Config->s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX);
 	}
 
 	void OnServHelp(User *u)
 	{
-		notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_RECOVER);
+		notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_RECOVER);
 	}
 };