X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sslmodes.cpp;h=fda90c3d8278c9b77cb934c6690cfec7be84cf0b;hb=HEAD;hp=5c7f1fca1f2dbe93f82b041e8ed53b7ccbdbec5b;hpb=ccebfe6e637b420bef05e8e0faf29bb19f1883d9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 5c7f1fca1..fda90c3d8 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,10 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Shawn Smith <ShawnSmith0828@gmail.com>
  *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
@@ -33,6 +34,8 @@ enum
 {
 	// From UnrealIRCd.
 	ERR_SECUREONLYCHAN = 489,
+
+	// InspIRCd-specific.
 	ERR_ALLMUSTSSL = 490
 };
 
@@ -119,27 +122,14 @@ class SSLModeUser : public ModeHandler
 
 	ModeAction OnModeChange(User* user, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
-		if (adding)
-		{
-			if (!dest->IsModeSet(this))
-			{
-				if (!API || !API->GetCertificate(user))
-					return MODEACTION_DENY;
+		if (adding == dest->IsModeSet(this))
+			return MODEACTION_DENY;
 
-				dest->SetMode(this, true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet(this))
-			{
-				dest->SetMode(this, false);
-				return MODEACTION_ALLOW;
-			}
-		}
+		if (adding && IS_LOCAL(user) && (!API || !API->GetCertificate(user)))
+			return MODEACTION_DENY;
 
-		return MODEACTION_DENY;
+		dest->SetMode(this, adding);
+		return MODEACTION_ALLOW;
 	}
 };
 
@@ -188,7 +178,7 @@ class ModuleSSLModes
 
 		User* target = msgtarget.Get<User>();
 
-		/* If one or more of the parties involved is a ulined service, we wont stop it. */
+		/* If one or more of the parties involved is a ulined service, we won't stop it. */
 		if (user->server->IsULine() || target->server->IsULine())
 			return MOD_RES_PASSTHRU;