X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_banredirect.cpp;h=1b9e361bf408dc12fd0697f354323388941a3545;hb=2550d001423d25b50c7bfdc89f6efe81dbb64612;hp=c2dff91267fd2621262a66628543567f253a697e;hpb=d0aa0fab53653ed86da9773c96acaa20021f0003;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index c2dff9126..1b9e361bf 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -75,6 +75,9 @@ class BanRedirect : public ModeWatcher
 			if (param.length() >= 2 && param[1] == ':')
 				return true;
 
+			if (param.find('#') == std::string::npos)
+				return true;
+
 			if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
 			{
 				source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans);
@@ -119,6 +122,14 @@ class BanRedirect : public ModeWatcher
 				mask[NICK].swap(mask[IDENT]);
 			}
 
+			if (!mask[NICK].empty() && mask[IDENT].empty() && mask[HOST].empty())
+			{
+				if (mask[NICK].find('.') != std::string::npos || mask[NICK].find(':') != std::string::npos)
+				{
+					mask[NICK].swap(mask[HOST]);
+				}
+			}
+
 			for(int i = 0; i < 3; i++)
 			{
 				if(mask[i].empty())
@@ -269,13 +280,6 @@ class ModuleBanRedirect : public Module
 
 	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		/* This prevents recursion when a user sets multiple ban redirects in a chain
-		 * (thanks Potter)
-		 */
-		if (nofollow)
-			return MOD_RES_PASSTHRU;
-
-		/* Return 1 to prevent the join, 0 to allow it */
 		if (chan)
 		{
 			BanRedirectList* redirects = re.extItem.get(chan);
@@ -303,6 +307,16 @@ class ModuleBanRedirect : public Module
 				{
 					if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask))
 					{
+						/* This prevents recursion when a user sets multiple ban redirects in a chain
+						 * (thanks Potter)
+						 *
+						 * If we're here and nofollow is true then we're already redirecting this user
+						 * and there's a redirecting ban set on this channel that matches him, too.
+						 * Deny both joins.
+						 */
+						if (nofollow)
+							return MOD_RES_DENY;
+
 						/* tell them they're banned and are being transferred */
 						Channel* destchan = ServerInstance->FindChan(redir->targetchan);
 						std::string destlimit;
@@ -318,7 +332,7 @@ class ModuleBanRedirect : public Module
 						else
 						{
 							user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
-							user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transfered to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str());
+							user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transferred to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str());
 							nofollow = true;
 							Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
 							nofollow = false;