aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPaul Aurich <paul@darkrain42.org>2009-10-03 19:20:20 -0700
committerPaul Aurich <paul@darkrain42.org>2009-10-03 19:20:20 -0700
commit02d5993f79dc0c4c98da669b660172ea4c610a75 (patch)
tree7910f57c0290fd62123b2687e7fccbbb08c6bdfa /core
parent24d115f8cd9dd5decf3335334dda416d28e8a4c4 (diff)
downloadprosody-02d5993f79dc0c4c98da669b660172ea4c610a75.tar.gz
prosody-02d5993f79dc0c4c98da669b660172ea4c610a75.zip
Minor changes; outgoing TLS works.
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 716d174e..c374b72a 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -337,7 +337,7 @@ function streamopened(session, attr)
local send = session.sends2s;
-- TODO: #29: SASL/TLS on s2s streams
- session.version = 0; --tonumber(attr.version) or 0;
+ session.version = tonumber(attr.version) or 0;
if session.version >= 1.0 and not (attr.to and attr.from) then
log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC");
@@ -387,6 +387,7 @@ function streamopened(session, attr)
-- If server is pre-1.0, don't wait for features, just do dialback
if session.version < 1.0 then
if not session.dialback_verifying then
+ log("debug", "Initiating dialback...");
initiate_dialback(session);
else
mark_connected(session);