From 392ff5ef8fdac46d5f0a28d3fd12f25a7c541ddf Mon Sep 17 00:00:00 2001
From: w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 24 Aug 2008 23:42:20 +0000
Subject: Forward-port r10257, fixes bug #599 reported by mixx941.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10258 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modes/umode_o.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/modes/umode_o.cpp')

diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 7cee7d238..fee6fb447 100644
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -24,7 +24,9 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
 ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
 {
 	/* Only opers can execute this class at all */
-	if (!IS_OPER(source))
+	if (!ServerInstance->ULine(source->nick) &&
+		!ServerInstance->ULine(source->server) &&
+		!*source->oper)
 		return MODEACTION_DENY;
 
 	/* Not even opers can GIVE the +o mode, only take it away */
-- 
cgit v1.2.3