X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=e6e01570d83153a0aff3410041f9cca2a1a82260;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=3e9c37a34807c286413a583b3e9d399ab34364b6;hpb=e4b17fd39b476fefec73d0956e6f40bd7ec254fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 3e9c37a34..e6e01570d 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -194,7 +194,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());
 	}
@@ -341,7 +341,7 @@ class CommandCap : public SplitCommand
 
 	static void DisplayResult(LocalUser* user, std::string& result)
 	{
-		if (result.size() > 5)
+		if (*result.rbegin() == ' ')
 			result.erase(result.end()-1);
 		user->WriteCommand("CAP", result);
 	}
@@ -398,7 +398,7 @@ class CommandCap : public SplitCommand
 		}
 		else
 		{
-			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s :Invalid CAP subcommand", subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, subcommand, "Invalid CAP subcommand");
 			return CMD_FAILURE;
 		}