Fixed /kill bug in m_operlevels (couldnt kill non-opers)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1069 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 4 insertions, 1 deletions

diff --git a/src/commands.cpp b/src/commands.cpp
index ca387d4cf..bd2c57983 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -365,9 +365,11 @@ void handle_kill(char **parameters, int pcnt, userrec *user)
         log(DEBUG,"kill: %s %s",parameters[0],parameters[1]);
 	if (u)
 	{
+		log(DEBUG,"into kill mechanism");
 		int MOD_RESULT = 0;
                 FOREACH_RESULT(OnKill(user,u,parameters[1]));
                 if (MOD_RESULT) {
+			log(DEBUG,"A module prevented the kill with result %d",MOD_RESULT);
                         return;
                 }
 
@@ -396,6 +398,7 @@ void handle_kill(char **parameters, int pcnt, userrec *user)
 		else
 		{
 			// local kill
+			log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]);
 			WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerName,user->dhost,user->nick,parameters[1]);
 			WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
 			snprintf(killreason,MAXBUF,"Killed (%s (%s))",user->nick,parameters[1]);
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 69954b208..ad9331a26 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -71,8 +71,8 @@ class ModuleOperLevels : public Module
 					WriteServ(source->fd,"481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
 					return 1;
 				}
-				return 0;
 			}
+			return 0;
 		}
 
 };