summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2010-01-16 22:58:05 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2010-01-16 22:58:05 +0000
commit54242e2c5839c5493a344badb49cbcb76e298f9f (patch)
treef6e7a4a9dbacd3069cd0988fad1d3a89a2a5d049 /src
parentd7e03c2b55acd8dd2721284fda01331671bb629e (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/configreader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 5cea9e149..c62973c89 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -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:");