X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=e7f23e145fc27cb24e2b39530668dd38093dea53;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=ef93867df3e321a8d3ab59d31ea98b46ded5f292;hpb=9bc8b2602426e187c4c5ba6ff0fad0641155357a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index ef93867df..e7f23e145 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -11,12 +11,12 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
 #include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for channel mode +N which prevents nick changes on channel */
 
@@ -53,7 +53,7 @@ class ModuleNoNickChange : public Module
 	NoNicks* nn;
  public:
 	ModuleNoNickChange(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		nn = new NoNicks(ServerInstance);
@@ -86,13 +86,15 @@ class ModuleNoNickChange : public Module
 
 				if (curr->IsModeSet('N'))
 				{
-					// don't allow the nickchange, theyre on at least one channel with +N set
-					// and theyre not an oper
+					if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+						continue;
+
 					user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
 					return 1;
 				}
 			}
 		}
+
 		return 0;
 	}
 };
@@ -118,7 +120,7 @@ class ModuleNoNickChangeFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleNoNickChangeFactory;
 }