X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=c93e37e1fc35f8a649e873af09cba4c481df5b02;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=75f17b61ab2ad9ebf1e213d47dec9c725469e8b8;hpb=5bbc2a31d69c82e04193b6a60c8e6ca5001685d2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 75f17b61a..c93e37e1f 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -21,7 +21,7 @@
 ServerConfig::ServerConfig()
 {
 	WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
-	NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
+	RawLog = NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
 	WildcardIPv6 = CycleHosts = InvBypassModes = true;
 	dns_timeout = 5;
 	MaxTargets = 20;
@@ -148,8 +148,11 @@ static void FindDNS(std::string& server)
 		if (server == "nameserver")
 		{
 			resolv >> server;
-			ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
-			return;
+			if (server.find_first_not_of("0123456789.") == std::string::npos)
+			{
+				ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
+				return;
+			}
 		}
 	}
 
@@ -429,6 +432,22 @@ void ServerConfig::Fill()
 {
 	ConfigTag* options = ConfValue("options");
 	ConfigTag* security = ConfValue("security");
+	if (sid.empty())
+	{
+		ServerName = ConfValue("server")->getString("name");
+		sid = ConfValue("server")->getString("id");
+		ValidHost(ServerName, "<server:name>");
+		if (!sid.empty() && !ServerInstance->IsSID(sid))
+			throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+	}
+	else
+	{
+		if (ServerName != ConfValue("server")->getString("name"))
+			throw CoreException("You must restart to change the server name or SID");
+		std::string nsid = ConfValue("server")->getString("id");
+		if (!nsid.empty() && nsid != sid)
+			throw CoreException("You must restart to change the server name or SID");
+	}
 	diepass = ConfValue("power")->getString("diepass");
 	restartpass = ConfValue("power")->getString("restartpass");
 	powerhash = ConfValue("power")->getString("hash");
@@ -441,10 +460,8 @@ void ServerConfig::Fill()
 	SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds());
 	MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
 	MoronBanner = options->getString("moronbanner", "You're banned!");
-	ServerName = ConfValue("server")->getString("name");
 	ServerDesc = ConfValue("server")->getString("description", "Configure Me");
 	Network = ConfValue("server")->getString("network", "Network");
-	sid = ConfValue("server")->getString("id", "");
 	AdminName = ConfValue("admin")->getString("name", "");
 	AdminEmail = ConfValue("admin")->getString("email", "null@example.com");
 	AdminNick = ConfValue("admin")->getString("nick", "admin");
@@ -465,6 +482,7 @@ void ServerConfig::Fill()
 	NoUserDns = ConfValue("performance")->getBool("nouserdns");
 	SyntaxHints = options->getBool("syntaxhints");
 	CycleHosts = options->getBool("cyclehosts");
+	CycleHostsFromUser = options->getBool("cyclehostsfromuser");
 	UndernetMsgPrefix = options->getBool("ircumsgprefix");
 	FullHostInTopic = options->getBool("hostintopic");
 	MaxTargets = security->getInt("maxtargets", 20);
@@ -497,9 +515,6 @@ void ServerConfig::Fill()
 	range(WhoWasMaxKeep, 3600, INT_MAX, 3600, "<whowas:maxkeep>");
 
 	ValidIP(DNSServer, "<dns:server>");
-	ValidHost(ServerName, "<server:name>");
-	if (!sid.empty() && !ServerInstance->IsSID(sid))
-		throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
 
 	std::string defbind = options->getString("defaultbind");
 	if (assign(defbind) == "ipv4")
@@ -602,6 +617,15 @@ void ServerConfig::Read()
 void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 {
 	valid = true;
+	if (old)
+	{
+		/*
+		 * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
+		 */
+		this->ServerName = old->ServerName;
+		this->sid = old->sid;
+		this->cmdline = old->cmdline;
+	}
 
 	/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
 	try
@@ -632,16 +656,9 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	// 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.
-	 */
 	if (old)
 	{
-		this->ServerName = old->ServerName;
-		this->sid = old->sid;
-		this->cmdline = old->cmdline;
-
-		// Same for ports... they're bound later on first run.
+		// On first run, ports are bound later on
 		FailedPortList pl;
 		ServerInstance->BindPorts(pl);
 		if (pl.size())
@@ -785,10 +802,15 @@ bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
 
 ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 {
-	ConfigDataHash::iterator iter = config_data.find(tag);
-	if (iter == config_data.end())
+	ConfigTagList found = config_data.equal_range(tag);
+	if (found.first == found.second)
 		return NULL;
-	return iter->second;
+	ConfigTag* rv = found.first->second;
+	found.first++;
+	if (found.first != found.second)
+		ServerInstance->Logs->Log("CONFIG",DEFAULT, "Multiple <" + tag + "> tags found; only first will be used "
+			"(first at " + rv->getTagLocation() + "; second at " + found.first->second->getTagLocation() + ")");
+	return rv;
 }
 
 ConfigTagList ServerConfig::ConfTags(const std::string& tag)
@@ -837,9 +859,7 @@ void ConfigReaderThread::Finish()
 {
 	ServerConfig* old = ServerInstance->Config;
 	ServerInstance->Logs->Log("CONFIG",DEBUG,"Switching to new configuration...");
-	ServerInstance->Logs->CloseLogs();
 	ServerInstance->Config = this->Config;
-	ServerInstance->Logs->OpenFileLogs();
 	Config->Apply(old, TheUserUID);
 
 	if (Config->valid)
@@ -860,13 +880,17 @@ void ConfigReaderThread::Finish()
 		FOREACH_MOD(I_OnRehash, OnRehash(user));
 		ServerInstance->BuildISupport();
 
+		ServerInstance->Logs->CloseLogs();
+		ServerInstance->Logs->OpenFileLogs();
+
+		if (Config->RawLog)
+			ServerInstance->Users->ServerNoticeAll("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
+
 		Config = old;
 	}
 	else
 	{
 		// whoops, abort!
-		ServerInstance->Logs->CloseLogs();
 		ServerInstance->Config = old;
-		ServerInstance->Logs->OpenFileLogs();
 	}
 }