X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=89391c8a4bf6268e3ae8c6e438787049e1491bf0;hb=55fa754510a00ea6691b9448389b006136d9e628;hp=599144448833c1aea22837fbfd4543b915151672;hpb=6fe1f4e1136f2ab95a88e68af1894bf6002d03f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 599144448..89391c8a4 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -109,12 +109,14 @@ class CommandJumpserver : public Command
 			{
 				/* Redirect everyone but the oper sending the command */
 				const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-				for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
+				for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); )
 				{
+					// Quitting the user removes it from the list
 					LocalUser* t = *i;
+					++i;
 					if (!t->IsOper())
 					{
-						t->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", parameters[0].c_str(), GetPort(t));
+						t->WriteNumeric(RPL_REDIR, parameters[0], GetPort(t), "Please use this Server/Port instead");
 						ServerInstance->Users->QuitUser(t, reason);
 						n_done++;
 					}
@@ -138,7 +140,7 @@ class CommandJumpserver : public Command
 
 	int GetPort(LocalUser* user)
 	{
-		int p = (SSLClientCert::GetCertificate(&user->eh) ? sslport : port);
+		int p = (SSLIOHook::IsSSL(&user->eh) ? sslport : port);
 		if (p == 0)
 			p = user->GetServerPort();
 		return p;
@@ -158,10 +160,9 @@ class ModuleJumpServer : public Module
 		if (js.redirect_new_users)
 		{
 			int port = js.GetPort(user);
-			user->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead",
-				js.redirect_to.c_str(), port);
+			user->WriteNumeric(RPL_REDIR, js.redirect_to, port, "Please use this Server/Port instead");
 			ServerInstance->Users->QuitUser(user, js.reason);
-			return MOD_RES_PASSTHRU;
+			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
 	}