# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1330190475 0
# Node ID eb97612bf42bce5d275f657eed4d163c741fd13d
# Parent  b827401581c545cb9fd911a4610aa7eb5739646c# Parent  92597f6223de90379df9c04f9bfff69b80b48ca4
Merge with 0.9

diff -r b827401581c5 -r eb97612bf42b core/s2smanager.lua
--- a/core/s2smanager.lua	Sat Feb 25 02:03:26 2012 +0000
+++ b/core/s2smanager.lua	Sat Feb 25 17:21:15 2012 +0000
@@ -512,7 +512,12 @@
 			(session.log or log)("debug", "certificate chain validation result: valid");
 			session.cert_chain_status = "valid";
 
-			local host = session.direction == "incoming" and session.from_host or session.to_host
+			local host;
+			if session.direction == "incoming" then
+				host = session.from_host;
+			else
+				host = session.to_host;
+			end
 
 			-- We'll go ahead and verify the asserted identity if the
 			-- connecting server specified one.