diff options
| -rw-r--r-- | ejabberd.yml.example | 2 | ||||
| -rw-r--r-- | src/ejabberd_s2s.erl | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ejabberd.yml.example b/ejabberd.yml.example index 922400d2d..5f747144f 100644 --- a/ejabberd.yml.example +++ b/ejabberd.yml.example @@ -231,7 +231,7 @@ listen: ## ## s2s_use_starttls: Enable STARTTLS for S2S connections. -## Allowed values are: false optional required required_trusted +## Allowed values are: false, optional or required ## You must specify a certificate file. ## ## s2s_use_starttls: required 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; |