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
commit663261871fffe8f4021e86a4b43be5f4c2331795 (patch)
tree0711b5f60f7a08ce1aa08b944317eb471f532782
parentbfd2c5fee05474008a1b5df153ed42f00fe16222 (diff)
parent84b23d1546d1fc76ba603bbe1d89d9a35e24b6de (diff)
downloadprosody-663261871fffe8f4021e86a4b43be5f4c2331795.tar.gz
prosody-663261871fffe8f4021e86a4b43be5f4c2331795.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