# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1336697136 -3600
# Node ID d91dda67647ad37ee22a0b0216373833c606ccf0
# Parent  ce793cea9f10c326773d690a79adab928c993d1d# Parent  88101f6521742dd9532468d850e5a81af4967dfb
Merge with backout

diff -r ce793cea9f10 -r d91dda67647a plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Fri May 11 01:32:46 2012 +0100
+++ b/plugins/mod_dialback.lua	Fri May 11 01:45:36 2012 +0100
@@ -79,7 +79,11 @@
 		local compat_check;
 		if not origin.from_host then
 			-- Just used for friendlier logging
-			origin.from_host = attr.from;
+			origin.from_host = nameprep(attr.from);
+			if not origin.from_host then
+				origin.log("debug", "We need to know where to connect but remote server blindly refuses to tell us and to comply to specs, closing connection.");
+				origin:close("invalid-from");
+			end
 		end
 		if not origin.to_host then
 			-- Just used for friendlier logging