Fix crash on propogation after routed squit has reached it's destination. Thx HiroP.

[user/henk/code/inspircd.git] / src / modules / m_operlevels.cpp

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index f8fdb89d69760b416224d9d846f304702b48afcb..918d444acc2013497ddd4875cc652cf66ab8b73a 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include <string>
-
-#include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
 
@@ -33,7 +31,7 @@ class ModuleOperLevels : public Module
        public:
 
                ModuleOperLevels(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
 
                        
@@ -64,8 +62,9 @@ class ModuleOperLevels : public Module
                virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
                {
                        long dest_level = 0,source_level = 0;
+
                        // oper killing an oper?
-                       if (*dest->oper)
+                       if (IS_OPER(dest) && IS_OPER(source))
                        {
                                for (int j =0; j < conf->Enumerate("type"); j++)
                                {
@@ -89,7 +88,7 @@ class ModuleOperLevels : public Module
                                {
                                        ServerInstance->WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
                                        dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
-                                       source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
+                                       source->WriteServ("481 %s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
                                        return 1;
                                }
                        }
@@ -116,7 +115,7 @@ class ModuleOperLevelsFactory : public ModuleFactory
 
 };
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleOperLevelsFactory;
 }