Allow options:casemapping to remain defined when using m_nationalchars.

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 782a80080aad8e9e83cc4e741ce557c30733ad01..2a1da8fd8fbb23dac1c699c39a8d3968f5a64692 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");
 
        }