diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-02-25 17:21:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-02-25 17:21:15 +0000 |
| commit | 4ba5589a50b2cefee335af2f12eff770079ef5d7 (patch) | |
| tree | 868a3a29332ad6fa53c6e03933291be1416e2186 /core | |
| parent | d9b9c623c47e173d1194de5d35ab458b93445af6 (diff) | |
| parent | 972ed38d125a6b3d842289b8e6b83a5b3c2b1f28 (diff) | |
| download | prosody-4ba5589a50b2cefee335af2f12eff770079ef5d7.tar.gz prosody-4ba5589a50b2cefee335af2f12eff770079ef5d7.zip | |
Merge with 0.9
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 7 |
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. |