mod_console: s2s:close: Use session:close() if that exists, otherwise just destroy...

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 8926edfc33293fa295fc790c2e4079f21979cc89..10455559dd600dabb593bb75ff31dc5dccc5eac1 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -6,14 +6,11 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local st = require "util.stanza";
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
-local config = require "core.configmanager";
-local secure_auth_only = config.get("*", "core", "require_encryption");
+local secure_auth_only = module:get_option("require_encryption");
 
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
@@ -31,7 +28,7 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                
 local starttls_attr = { xmlns = xmlns_starttls };
 module:add_event_hook("stream-features", 
-               function (session, features)                                                                                            
+               function (session, features)
                        if session.conn.starttls then
                                features:tag("starttls", starttls_attr);
                                if secure_auth_only then