From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Fri, 19 Jun 2015 22:14:54 +0000 (+0200)
Subject: Add s2s_dhfile to list of known options
X-Git-Tag: 15.06~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc0754c609cfecf567a712602c94716fbacc5712;p=ejabberd

Add s2s_dhfile to list of known options
---

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index be5532cd0..99a313ef6 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -743,5 +743,5 @@ opt_type(s2s_use_starttls) ->
     end;
 opt_type(_) ->
     [domain_certfile, max_fsm_queue, s2s_certfile,
-     s2s_ciphers, s2s_protocol_options, s2s_tls_compression,
-     s2s_use_starttls].
+     s2s_ciphers, s2s_dhfile, s2s_protocol_options,
+     s2s_tls_compression, s2s_use_starttls].
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index b512232db..77e159cdc 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -1409,6 +1409,6 @@ opt_type(s2s_use_starttls) ->
 opt_type(_) ->
     [domain_certfile, max_fsm_queue, outgoing_s2s_families,
      outgoing_s2s_port, outgoing_s2s_timeout, s2s_certfile,
-     s2s_ciphers, s2s_dns_retries, s2s_dns_timeout,
+     s2s_ciphers, s2s_dhfile, s2s_dns_retries, s2s_dns_timeout,
      s2s_max_retry_delay, s2s_protocol_options,
      s2s_tls_compression, s2s_use_starttls].