ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Manual port of don't error on failed port bind commit.

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12274 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2010-01-16 22:58:05 +00:00
parent d7e03c2b55
commit 54242e2c58
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/configreader.cpp
View File

@ -617,6 +617,9 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
// write once here, to try it out and make sure its ok // write once here, to try it out and make sure its ok
ServerInstance->WritePID(this->PID); ServerInstance->WritePID(this->PID);
// Check errors before dealing with failed binds, since continuing on failed bind is wanted in some circumstances.
valid = errstr.str().empty();
/* /*
* These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername. * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
*/ */
@ -645,7 +648,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid); User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
valid = errstr.str().empty();
if (!valid) if (!valid)
ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:"); ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:");