X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=7cd0b4914af46dd334ec1fee37a0c5f7ba4984ef;hb=fd3898589e42f62c008bc958ba74adff5781a551;hp=a333ea0b0fc6a76329360b3ccabedfe2ec1c8e05;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index a333ea0b0..7cd0b4914 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -23,8 +23,14 @@ class PermChannel : public ModeHandler
  public:
 	PermChannel(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool sm)
 	{
+		if (!source->HasPrivPermission("channels/set-permanent"))
+		{
+			source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges", source->nick.c_str());
+			return MODEACTION_DENY;
+		}
+
 		if (adding)
 		{
 			if (!channel->IsModeSet('P'))
@@ -37,10 +43,30 @@ class PermChannel : public ModeHandler
 		{
 			if (channel->IsModeSet('P'))
 			{
-				channel->SetMode('P',false);
+				if (channel->GetUserCounter() == 0 && !sm)
+				{
+					/*
+					 * ugh, ugh, UGH!
+					 *
+					 * We can't delete this channel the way things work at the moment,
+					 * because of the following scenario:
+					 * s1:#c <-> s2:#c
+					 *
+					 * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS.
+					 *
+					 * On netmerge, s2 loses, so s2 removes all modes (including +P) which
+					 * would subsequently delete the channel here causing big fucking problems.
+					 *
+					 * I don't think there's really a way around this, so just deny -P on a 0 user chan.
+					 * -- w00t
+					 *
+					 * delete channel;
+					 */
+					return MODEACTION_DENY;
+				}
 
-				if (channel->GetUserCounter() == 0)
-					delete channel;
+				/* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
+				channel->SetMode('P',false);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -87,9 +113,9 @@ public:
 			std::string topic = MyConf.ReadValue("permchannels", "topic", i);
 			std::string modes = MyConf.ReadValue("permchannels", "modes", i);
 
-			if (channel.empty() || topic.empty())
+			if (channel.empty())
 			{
-				ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty topic or channel name.");
+				ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty channel name.");
 				continue;
 			}
 
@@ -98,7 +124,8 @@ public:
 			if (!c)
 			{
 				c = new Channel(ServerInstance, channel, ServerInstance->Time());
-				c->SetTopic(NULL, topic, true);
+				if (!topic.empty())
+					c->SetTopic(NULL, topic, true);
 				ServerInstance->Logs->Log("blah", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
 
 				if (modes.empty())