From 876b1ae4e280e99f24d37da4b819f108ddb3f1e3 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Fri, 21 Sep 2018 20:54:05 +0100
Subject: Don't sync xlines defined in the config and expire them on rehash.

Closes #1427.
---
 src/configreader.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/configreader.cpp')

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 6c7cb492a..a8e94586d 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -108,6 +108,7 @@ static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::str
 			throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation());
 		std::string reason = ctag->getString("reason", "<Config>");
 		XLine* xl = make->Generate(ServerInstance->Time(), 0, "<Config>", reason, mask);
+		xl->from_config = true;
 		if (!ServerInstance->XLines->AddLine(xl, NULL))
 			delete xl;
 	}
@@ -446,6 +447,7 @@ void ServerConfig::Fill()
 			SocketEngine::Close(socktest);
 	}
 
+	ServerInstance->XLines->ClearConfigLines();
 	ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
 	ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q"));
 	ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
-- 
cgit v1.3.1-10-gc9f91