X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=1465f8a383436b6a4f25ce526e2a24b802fe2c7b;hb=b7716ed57704b2b2bcc665a590aecc8f02de631d;hp=f74f27f1618ad4b772ffa91d3b1ff86347837589;hpb=03561f500eb8e82b2ddfa0489fb4ae03c2c9631b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index f74f27f16..1465f8a38 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -21,6 +21,12 @@
 #include "modules/reload.h"
 #include "modules/cap.h"
 
+enum
+{
+	// From IRCv3 capability-negotiation-3.1.
+	ERR_INVALIDCAPCMD = 410
+};
+
 namespace Cap
 {
 	class ManagerImpl;
@@ -55,7 +61,8 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener
 
 	static bool CanRequest(LocalUser* user, Ext usercaps, Capability* cap, bool adding)
 	{
-		if ((usercaps & cap->GetMask()) == adding)
+		const bool hascap = ((usercaps & cap->GetMask()) != 0);
+		if (hascap == adding)
 			return true;
 
 		return cap->OnRequest(user, adding);
@@ -194,7 +201,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener
 			cap->set(user, false);
 		}
 
-		ServerInstance->Modules.DelReferent(cap);		
+		ServerInstance->Modules.DelReferent(cap);
 		cap->Unregister();
 		caps.erase(cap->GetName());
 	}
@@ -398,7 +405,7 @@ class CommandCap : public SplitCommand
 		}
 		else
 		{
-			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s :Invalid CAP subcommand", subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPCMD, subcommand.empty() ? "*" : subcommand, "Invalid CAP subcommand");
 			return CMD_FAILURE;
 		}