aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-25 17:21:15 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-25 17:21:15 +0000
commitaf22709a5ec8dd87242e7f69de6ab33cdf7cc41c (patch)
tree868a3a29332ad6fa53c6e03933291be1416e2186
parentba9e28535b28d3a9a2e8eca7b8a740a8ffad49c1 (diff)
parentf9853f402b8257dba0b5bacd5e522ba89c9ade25 (diff)
downloadprosody-af22709a5ec8dd87242e7f69de6ab33cdf7cc41c.tar.gz
prosody-af22709a5ec8dd87242e7f69de6ab33cdf7cc41c.zip
Merge with 0.9
-rw-r--r--core/s2smanager.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 6c880a02..a27b2b2d 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -512,7 +512,12 @@ local function check_cert_status(session)
(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.