From 11f9d1772e89c1f2dc62e7fd64b36fafa2b5b245 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 27 Jan 2018 22:10:31 +0100 Subject: [PATCH] Fix a merge artifact --- evennia/server/portal/portal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index 1163133979..a720c73c71 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -245,10 +245,11 @@ if SSL_ENABLED: ifacestr = "-%s" % interface for port in SSL_PORTS: pstring = "%s:%s" % (ifacestr, port) - factory = telnet_ssl.SSLServerFactory() + factory = protocol.ServerFactory() factory.noisy = False factory.sessionhandler = PORTAL_SESSIONS factory.protocol = telnet_ssl.SSLProtocol + ssl_context = telnet_ssl.getSSLContext() if ssl_context: ssl_service = internet.SSLServer(port, @@ -259,7 +260,6 @@ if SSL_ENABLED: PORTAL.services.addService(ssl_service) INFO_DICT["telnet_ssl"].append("telnet+ssl%s: %s" % (ifacestr, port)) - print(" ssl%s: %s" % (ifacestr, port)) else: INFO_DICT["telnet_ssl"].append( "telnet+ssl%s: %s (deactivated - keys/cert unset)" % (ifacestr, port))