X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=02950e0e97c3c12e85dbfc4016708442e441830e;hb=26a80ed2c783bda2bc7abca9dd435b86f3ce2eeb;hp=9f3b41af7f514b1a564f04e58169ed06ccfbfd3e;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 9f3b41af7..02950e0e9 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -38,8 +38,11 @@ class CommandJumpserver : public Command
 	std::string reason;
 	int port;
 	int sslport;
+	UserCertificateAPI sslapi;
 
-	CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
+	CommandJumpserver(Module* Creator)
+		: Command(Creator, "JUMPSERVER", 0, 4)
+		, sslapi(Creator)
 	{
 		flags_needed = 'o';
 		syntax = "[<server> <port>[:<sslport>] <+/-an> <reason>]";
@@ -100,8 +103,8 @@ class CommandJumpserver : public Command
 			}
 
 			size_t delimpos = parameters[1].find(':');
-			port = ConvToInt(parameters[1].substr(0, delimpos ? delimpos : std::string::npos));
-			sslport = (delimpos == std::string::npos ? 0 : ConvToInt(parameters[1].substr(delimpos + 1)));
+			port = ConvToNum<int>(parameters[1].substr(0, delimpos ? delimpos : std::string::npos));
+			sslport = (delimpos == std::string::npos ? 0 : ConvToNum<int>(parameters[1].substr(delimpos + 1)));
 
 			if (parameters[1].find_first_not_of("0123456789:") != std::string::npos
 				|| parameters[1].rfind(':') != delimpos
@@ -146,7 +149,7 @@ class CommandJumpserver : public Command
 
 	int GetPort(LocalUser* user)
 	{
-		int p = (SSLIOHook::IsSSL(&user->eh) ? sslport : port);
+		int p = (sslapi && sslapi->GetCertificate(user) ? sslport : port);
 		if (p == 0)
 			p = user->GetServerPort();
 		return p;
@@ -161,6 +164,12 @@ class ModuleJumpServer : public Module
 	{
 	}
 
+	void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE
+	{
+		if (irc::equals(param, "jumpserver") && js.redirect_new_users)
+			js.redirect_new_users = false;
+	}
+
 	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
 		if (js.redirect_new_users)