Don't sync xlines defined in the config and expire them on rehash.

Closes #1427.

1 files changed, 22 insertions, 1 deletions

diff --git a/src/xline.cpp b/src/xline.cpp
index cb4f011c0..d07fe0dc5 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -518,7 +518,7 @@ void XLine::Apply(User* u)
 
 bool XLine::IsBurstable()
 {
-	return true;
+	return !from_config;
 }
 
 void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
@@ -747,3 +747,24 @@ XLineFactory* XLineManager::GetFactory(const std::string &type)
 
 	return n->second;
 }
+
+void XLineManager::ClearConfigLines()
+{
+	// Nothing to do.
+	if (lookup_lines.empty())
+		return;
+
+	ServerInstance->SNO->WriteToSnoMask('x', "Server rehashing; expiring lines defined in the server config ...");
+	for (ContainerIter type = lookup_lines.begin(); type != lookup_lines.end(); ++type)
+	{
+		for (LookupIter xline = type->second.begin(); xline != type->second.end(); )
+		{
+			// We cache this to avoid iterator invalidation.
+			LookupIter cachedxline = xline++;
+			if (cachedxline->second->from_config)
+			{
+				ExpireLine(type, cachedxline);
+			}
+		}
+	}
+}