aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-10 23:17:06 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-10 23:17:06 +0100
commitc1fdd165bed28e7914d406938c278d811ef2bd65 (patch)
tree6bfc6f9e4c7f37e2bdc3f7dc065baf6eca197257 /plugins
parent2ea9714c6f63b8d5d0b74c14f47eab55b8b5957d (diff)
parentd617081ac45113fdaa8fc0604bee29a08d4aefed (diff)
downloadprosody-c1fdd165bed28e7914d406938c278d811ef2bd65.tar.gz
prosody-c1fdd165bed28e7914d406938c278d811ef2bd65.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_dialback.lua2
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 69616a57..b2f84603 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -117,7 +117,7 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
log("warn", "authoritative server for %s denied the key", attr.from or "(unknown)");
valid = "invalid";
end
- if not dialback_verifying.sends2s then
+ if dialback_verifying.destroyed then
log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", tostring(dialback_verifying):match("%w+$"));
else
dialback_verifying.sends2s(
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index 17978b39..07623968 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -94,7 +94,7 @@ function s2sout.attempt_connection(host_session, err)
handle = adns.lookup(function (answer)
handle = nil;
host_session.connecting = nil;
- if answer then
+ if answer and #answer > 0 then
log("debug", "%s has SRV records, handling...", to_host);
local srv_hosts = {};
host_session.srv_hosts = srv_hosts;