From bc388aa97c1e8ab4ebea729d116e868cff11e137 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Sat, 5 Dec 2015 15:35:05 +0100
Subject: m_cap Add Capability::OnRequest() hook

---
 src/modules/m_cap.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_cap.cpp')

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 9e857ad28..bb5a506c9 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -32,6 +32,14 @@ class Cap::ManagerImpl : public Cap::Manager
 	ExtItem capext;
 	CapMap caps;
 
+	static bool CanRequest(LocalUser* user, Ext usercaps, Capability* cap, bool adding)
+	{
+		if ((usercaps & cap->GetMask()) == adding)
+			return true;
+
+		return cap->OnRequest(user, adding);
+	}
+
 	Capability::Bit AllocateBit() const
 	{
 		Capability::Bit used = 0;
@@ -118,7 +126,7 @@ class Cap::ManagerImpl : public Cap::Manager
 				capname.erase(capname.begin());
 
 			Capability* cap = ManagerImpl::Find(capname);
-			if (!cap)
+			if ((!cap) || (!CanRequest(user, usercaps, cap, !remove)))
 				return false;
 
 			if (remove)
-- 
cgit v1.3.1-10-gc9f91