Merge branch 'tls-support'

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 7713d836329e58bd58e6397fd74edcaac243c135..4b8c3e8fc1ad6d76ad0af81b26f827f22d75befa 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -499,11 +499,11 @@ class BotConnection(object):
                self._nowrite = False
 
        def connect(self):
-               if self.parent.cfg.getboolean('erebus', 'tls'):
+               if self.parent.parent.cfg.getboolean('erebus', 'tls'):
                        import ssl
                        undersocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                        context = ssl.create_default_context()
-                       self.socket = context.wrap_socket(undersocket, self.server)
+                       self.socket = context.wrap_socket(undersocket, server_hostname=self.server)
                else:
                        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                self.socket.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1) # Does Python make SOL_TCP portable? Who knows, it's not documented, and it appears to come from the _socket C lib.