diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-09-02 11:44:11 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-09-02 11:45:06 +0300 |
| commit | 2acbf4625b7c69ef6151a38afc7654959b68f3ee (patch) | |
| tree | 6955325c665c429c347ae7fa2c578b996b679e42 /src | |
| parent | Introduce 'redirect_url' option for mod_register (diff) | |
Deprecate `s2s_use_starttls: required_trusted`
The functionality can be now obtained by using
`s2s_use_starttls: required` with `mod_s2s_dialback`
being unloaded.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index cb4e5e5ec..7a2bc3a4b 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -726,7 +726,13 @@ opt_type(s2s_use_starttls) -> (false) -> false; (optional) -> optional; (required) -> required; - (required_trusted) -> required_trusted + (required_trusted) -> + ?WARNING_MSG("The value 'required_trusted' of option " + "'s2s_use_starttls' is deprected and will be " + "unsupported in future releases. Instead, " + "set it to 'required' and make sure " + "mod_s2s_dialback is *NOT* loaded", []), + required_trusted end; opt_type(s2s_zlib) -> fun(B) when is_boolean(B) -> B end; |