diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-04-22 22:12:04 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-04-22 22:12:04 +0200 |
| commit | 4bc8b6bc9f18e01d96944fe17f09ea702059c1c7 (patch) | |
| tree | 446380d50f6b3a641efc9759908d3fa6661f1f99 /src | |
| parent | Merge pull request #162 from weiss/enable-carbons (diff) | |
Fix extraction of host names from certificates
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index bd2f13a8a..6afd8d1f2 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -749,7 +749,7 @@ get_cert_domains(Cert) -> case 'OTP-PUB-KEY':decode('X520CommonName', Val) of {ok, {_, D1}} -> D = if is_binary(D1) -> D1; - is_binary(D1) -> (D1); + is_list(D1) -> list_to_binary(D1); true -> error end, if D /= error -> @@ -770,8 +770,7 @@ get_cert_domains(Cert) -> lists:flatmap(fun (#'Extension'{extnID = ?'id-ce-subjectAltName', extnValue = Val}) -> - BVal = if is_binary(Val) -> iolist_to_binary(Val); - is_binary(Val) -> Val; + BVal = if is_list(Val) -> list_to_binary(Val); true -> Val end, case 'OTP-PUB-KEY':decode('SubjectAltName', BVal) @@ -811,9 +810,9 @@ get_cert_domains(Cert) -> _ -> [] end; ({dNSName, D}) - when is_binary(D) -> + when is_list(D) -> case - jlib:string_to_jid(D) + jlib:string_to_jid(list_to_binary(D)) of #jid{luser = <<"">>, lserver = LD, |