From ace0f7f83f3322cc3b251835c7a44d63c8d8acb3 Mon Sep 17 00:00:00 2001
From: brain
Date: Mon, 5 Dec 2005 08:59:12 +0000
Subject: Added OnChangeHost Added OnChangeName

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2181 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/inspircd.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/inspircd.cpp')

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 2f64e621d..fcc91037b 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -571,10 +571,13 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 
 	if (!FindChan(cname))
 	{
-		MOD_RESULT = 0;
-		FOREACH_RESULT(OnUserPreJoin(user,NULL,cname));
-		if (MOD_RESULT == 1) {
-			return NULL;
+		if (strcmp(ServerName,u->server))
+		{
+			MOD_RESULT = 0;
+			FOREACH_RESULT(OnUserPreJoin(user,NULL,cname));
+			if (MOD_RESULT == 1) {
+				return NULL;
+			}
 		}
 
 		/* create a new one */
@@ -604,9 +607,9 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 		{
 			log(DEBUG,"add_channel: joining to: %s",Ptr->name);
 			
-			// the override flag allows us to bypass channel modes
+			// remote users are allowed us to bypass channel modes
 			// and bans (used by servers)
-			if ((!override) || (!strcasecmp(user->server,ServerName)))
+			if (!strcasecmp(ServerName,user->server))
 			{
 				log(DEBUG,"Not overriding...");
 				MOD_RESULT = 0;
-- 
cgit v1.3.1-10-gc9f91