aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_auth_pam.erl2
-rw-r--r--src/ejabberd_c2s.erl2
-rw-r--r--src/ejabberd_s2s.erl2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ejabberd_auth_pam.erl b/src/ejabberd_auth_pam.erl
index 603c8cd89..9e5e63ac1 100644
--- a/src/ejabberd_auth_pam.erl
+++ b/src/ejabberd_auth_pam.erl
@@ -41,7 +41,7 @@
opt_type/1]).
start(_Host) ->
- ejabberd:start_app(p1_pam).
+ ejabberd:start_app(epam).
set_password(_User, _Server, _Password) ->
{error, not_allowed}.
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index e6a7f9c39..28072a5f7 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -259,7 +259,7 @@ tls_options(#{lserver := LServer, tls_options := DefaultOpts}) ->
ejabberd_config:get_option(
{domain_certfile, LServer},
fun iolist_to_binary/1)) of
- undefined -> [];
+ undefined -> DefaultOpts;
CertFile -> lists:keystore(certfile, 1, DefaultOpts,
{certfile, CertFile})
end,
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index 946ac60c8..59ee9216d 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -204,7 +204,7 @@ tls_options(LServer, DefaultOpts) ->
ejabberd_config:get_option(
{domain_certfile, LServer},
fun iolist_to_binary/1)) of
- undefined -> [];
+ undefined -> DefaultOpts;
CertFile -> lists:keystore(certfile, 1, DefaultOpts,
{certfile, CertFile})
end,