Use FindUUID in place of FindNick in places that only get a UUID.

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 782a80080aad8e9e83cc4e741ce557c30733ad01..31bbfa9542441c7be1170fb39fc1b9cd8e8753b4 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -368,7 +368,8 @@ void ServerConfig::Fill()
                        throw CoreException("You must restart to change the server id");
 
                std::string casemapping = options->getString("casemapping");
-               if (!casemapping.empty() && casemapping != CaseMapping)
+               // Ignore this value if CaseMapping is set to something the core doesn't provide (i.e., m_nationalchars).
+               if (!casemapping.empty() && casemapping != CaseMapping && (CaseMapping == "ascii" || CaseMapping == "rfc1459"))
                        throw CoreException("You must restart to change the server casemapping");
 
        }
@@ -509,18 +510,17 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                ServerInstance->BindPorts(pl);
                if (pl.size())
                {
-                       errstr << "Not all your client ports could be bound." << std::endl
-                               << "The following port(s) failed to bind:" << std::endl;
-
-                       int j = 1;
-                       for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
+                       std::cout << "Warning! Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl;
+                       for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter)
                        {
-                               errstr << j << ".\tAddress: " << i->first.str() << "\tReason: " << strerror(i->second) << std::endl;
+                               const FailedPort& fp = *iter;
+                               errstr << "  " << fp.sa.str() << ": " << strerror(fp.error) << std::endl
+                                       << "  " << "Created from <bind> tag at " << fp.tag->getTagLocation() << std::endl;
                        }
                }
        }
 
-       User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
+       User* user = useruid.empty() ? NULL : ServerInstance->FindUUID(useruid);
 
        if (!valid)
        {
@@ -704,7 +704,7 @@ void ConfigReaderThread::Finish()
                ServerInstance->Users.RehashCloneCounts();
                ServerInstance->XLines->CheckELines();
                ServerInstance->XLines->ApplyLines();
-               User* user = ServerInstance->FindNick(TheUserUID);
+               User* user = ServerInstance->FindUUID(TheUserUID);
 
                ConfigStatus status(user);
                const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();