Merge remote branch 'origin/1.9.3' into 1.9

1 files changed, 25 insertions, 2 deletions

diff --git a/src/opertype.cpp b/src/opertype.cpp
index fb0689add..0ee6d000f 100644
--- a/src/opertype.cpp
+++ b/src/opertype.cpp
@@ -16,26 +16,44 @@ OperType::OperType(const ci::string &nname) : name(nname)
 
 bool OperType::HasCommand(const std::string &cmdstr) const
 {
-	for (std::list<std::string>::const_iterator it = this->commands.begin(); it != this->commands.end(); it++)
+	for (std::list<std::string>::const_iterator it = this->commands.begin(); it != this->commands.end(); ++it)
 	{
 		if (Anope::Match(cmdstr, *it))
 		{
 			return true;
 		}
 	}
+	for (std::set<OperType *>::const_iterator iit = this->inheritances.begin(); iit != this->inheritances.end(); ++iit)
+	{
+		OperType *ot = *iit;
+
+		if (ot->HasCommand(cmdstr))
+		{
+			return true;
+		}
+	}
 
 	return false;
 }
 
 bool OperType::HasPriv(const std::string &privstr) const
 {
-	for (std::list<std::string>::const_iterator it = this->privs.begin(); it != this->privs.end(); it++)
+	for (std::list<std::string>::const_iterator it = this->privs.begin(); it != this->privs.end(); ++it)
 	{
 		if (Anope::Match(privstr, *it))
 		{
 			return true;
 		}
 	}
+	for (std::set<OperType *>::const_iterator iit = this->inheritances.begin(); iit != this->inheritances.end(); ++iit)
+	{
+		OperType *ot = *iit;
+
+		if (ot->HasPriv(privstr))
+		{
+			return true;
+		}
+	}
 
 	return false;
 }
@@ -55,3 +73,8 @@ const ci::string &OperType::GetName() const
 	return this->name;
 }
 
+void OperType::Inherits(OperType *ot)
+{
+	this->inheritances.insert(ot);
+}
+