# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1404864397 -7200
# Node ID b6a47c7a496a34e7370e9720a02cbe173031e230
# Parent  38d82f8ead2566c04fbd22e4bdd598c7dd5bf7d9# Parent  c6d9e21cd5f20695fe0df48cb84c08a92ab81bf7
Merge 0.10->trunk

diff -r 38d82f8ead25 -r b6a47c7a496a plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Tue Jul 08 07:32:45 2014 +0200
+++ b/plugins/mod_dialback.lua	Wed Jul 09 02:06:37 2014 +0200
@@ -82,7 +82,7 @@
 		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