Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 20cf7c3dfef5738345615c1bb1837e0ffcec8079..af403dc9f9b02294d48685376359b98049739d53 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -21,20 +21,12 @@
 
 local st = require "util.stanza";
 
---local sessions = sessions;
-
-local t_insert = table.insert;
-
-local log = require "util.logger".init("mod_starttls");
-
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
                        if session.conn.starttls then
                                session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
-                               -- FIXME: I'm commenting the below, not sure why it was necessary
-                               -- sessions[session.conn] = nil;
                                session:reset_stream();
                                session.conn.starttls();
                                session.log("info", "TLS negotiation started...");
@@ -46,8 +38,8 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                
 local starttls_attr = { xmlns = xmlns_starttls };
 module:add_event_hook("stream-features", 
-                                       function (session, features)                                                                                            
-                                               if session.conn.starttls then
-                                                       features:tag("starttls", starttls_attr):up();
-                                               end
-                                       end);
+               function (session, features)                                                                                            
+                       if session.conn.starttls then
+                               features:tag("starttls", starttls_attr):up();
+                       end
+               end);