yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 17:59:31 +02:00
Code Issues Releases Wiki Activity

Ciphers should be a binary string

Browse source
This commit is contained in:
Evgeniy Khramtsov 2017-05-17 15:42:18 +03:00
parent 7165196211
commit a71065fcda
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ejabberd_c2s.erl
View file

@ -923,7 +923,7 @@ transform_listen_option(Opt, Opts) ->
(disable_sasl_mechanisms) -> fun((binary() | [binary()]) -> [binary()]); (disable_sasl_mechanisms) -> fun((binary() | [binary()]) -> [binary()]);
(atom()) -> [atom()]. (atom()) -> [atom()].
opt_type(c2s_certfile) -> fun misc:try_read_file/1; opt_type(c2s_certfile) -> fun misc:try_read_file/1;
opt_type(c2s_ciphers) -> fun misc:try_read_file/1; opt_type(c2s_ciphers) -> fun iolist_to_binary/1;
opt_type(c2s_dhfile) -> fun misc:try_read_file/1; opt_type(c2s_dhfile) -> fun misc:try_read_file/1;
opt_type(c2s_cafile) -> fun misc:try_read_file/1; opt_type(c2s_cafile) -> fun misc:try_read_file/1;
opt_type(c2s_protocol_options) -> opt_type(c2s_protocol_options) ->

2
src/ejabberd_http.erl
View file

@ -931,7 +931,7 @@ listen_opt_type(certfile) ->
iolist_to_binary(S) iolist_to_binary(S)
end; end;
listen_opt_type(ciphers) -> listen_opt_type(ciphers) ->
fun misc:try_read_file/1; fun iolist_to_binary/1;
listen_opt_type(dhfile) -> listen_opt_type(dhfile) ->
fun misc:try_read_file/1; fun misc:try_read_file/1;
listen_opt_type(protocol_options) -> listen_opt_type(protocol_options) ->

2
src/ejabberd_s2s.erl
View file

@ -710,7 +710,7 @@ opt_type(route_subdomains) ->
opt_type(s2s_access) -> opt_type(s2s_access) ->
fun acl:access_rules_validator/1; fun acl:access_rules_validator/1;
opt_type(s2s_certfile) -> fun misc:try_read_file/1; opt_type(s2s_certfile) -> fun misc:try_read_file/1;
opt_type(s2s_ciphers) -> fun misc:try_read_file/1; opt_type(s2s_ciphers) -> fun iolist_to_binary/1;
opt_type(s2s_dhfile) -> fun misc:try_read_file/1; opt_type(s2s_dhfile) -> fun misc:try_read_file/1;
opt_type(s2s_cafile) -> fun misc:try_read_file/1; opt_type(s2s_cafile) -> fun misc:try_read_file/1;
opt_type(s2s_protocol_options) -> opt_type(s2s_protocol_options) ->

2
src/ejabberd_service.erl
View file

@ -281,7 +281,7 @@ listen_opt_type(certfile) ->
ejabberd_pkix:add_certfile(S), ejabberd_pkix:add_certfile(S),
iolist_to_binary(S) iolist_to_binary(S)
end; end;
listen_opt_type(ciphers) -> fun misc:try_read_file/1; listen_opt_type(ciphers) -> fun iolist_to_binary/1;
listen_opt_type(dhfile) -> fun misc:try_read_file/1; listen_opt_type(dhfile) -> fun misc:try_read_file/1;
listen_opt_type(cafile) -> fun misc:try_read_file/1; listen_opt_type(cafile) -> fun misc:try_read_file/1;
listen_opt_type(protocol_options) -> listen_opt_type(protocol_options) ->