mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-09 18:49:03 -04:00
Manual port of don't error on failed port bind commit.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12274 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
parent
d7e03c2b55
commit
54242e2c58
@ -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
|
||||
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.
|
||||
*/
|
||||
@ -645,7 +648,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
|
||||
|
||||
User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
|
||||
|
||||
valid = errstr.str().empty();
|
||||
if (!valid)
|
||||
ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:");
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user