aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-07-09 02:06:37 +0200
committerKim Alvefur <zash@zash.se>2014-07-09 02:06:37 +0200
commit2023aaf6ca2f6ee7a0af2d18b275fc7c9dbba352 (patch)
tree0711b5f60f7a08ce1aa08b944317eb471f532782
parent2cc4b6a6aef216d80e788eac02e0e41633a22f07 (diff)
parent2957bd81cbcab588ff96fa755ee164d85859ab7d (diff)
downloadprosody-2023aaf6ca2f6ee7a0af2d18b275fc7c9dbba352.tar.gz
prosody-2023aaf6ca2f6ee7a0af2d18b275fc7c9dbba352.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_dialback.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 15e24281..2584299c 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -82,7 +82,7 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
local attr = stanza.attr;
local to, from = nameprep(attr.to), nameprep(attr.from);
- if origin.secure then
+ if dwd and origin.secure then
if check_cert_status(origin, from) == false then
return
elseif origin.cert_chain_status == "valid" and origin.cert_identity_status == "valid" then