diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-06-16 15:18:34 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-06-16 15:18:34 +0200 |
| commit | e6082742435bc18392aea785a3e9b667fce689c0 (patch) | |
| tree | ab798c6de0bc6a902da6cac298a405bd4dce1db0 /src | |
| parent | Merge pull request #581 from weiss/dh-param-file (diff) | |
Add s2s_dhfile option to configuration validator
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 1 | ||||
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index d890f0bc..be5532cd 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -722,6 +722,7 @@ opt_type(max_fsm_queue) -> fun (I) when is_integer(I), I > 0 -> I end; opt_type(s2s_certfile) -> fun iolist_to_binary/1; opt_type(s2s_ciphers) -> fun iolist_to_binary/1; +opt_type(s2s_dhfile) -> fun iolist_to_binary/1; opt_type(s2s_protocol_options) -> fun (Options) -> [_ | O] = lists:foldl(fun (X, Acc) -> X ++ Acc end, [], diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 7abc8177..b512232d 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -1381,6 +1381,7 @@ opt_type(outgoing_s2s_timeout) -> end; opt_type(s2s_certfile) -> fun iolist_to_binary/1; opt_type(s2s_ciphers) -> fun iolist_to_binary/1; +opt_type(s2s_dhfile) -> fun iolist_to_binary/1; opt_type(s2s_dns_retries) -> fun (I) when is_integer(I), I >= 0 -> I end; opt_type(s2s_dns_timeout) -> |