summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickaël Rémond <mickael.remond@process-one.net>2006-02-07 17:35:32 +0000
committerMickaël Rémond <mickael.remond@process-one.net>2006-02-07 17:35:32 +0000
commit2f0cf8bce8d7cb7a6dc8d1c84d946340dec1b1b1 (patch)
treec6c5fe24b139605e38485f6221c65a2c991f7a55
parent* src/mod_muc/mod_muc_room.erl: Kick non-members when room (diff)
* src/ejabberd_auth.erl: plugin authentication modules can now
be used in the configuration file: {auth_method, module} will now use the module ejabberd_auth_module.erl for authentication. (EJAB-45) SVN Revision: 501
-rw-r--r--ChangeLog6
-rw-r--r--src/ejabberd_auth.erl12
2 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 845bae5a..5e8ef8cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-07 Mickael Remond <mickael.remond@process-one.net>
+
+ * src/ejabberd_auth.erl: plugin authentication modules can now
+ be used in the configuration file: {auth_method, module} will now
+ use the module ejabberd_auth_module.erl for authentication.
+
2006-02-05 Alexey Shchepin <alexey@sevcom.net>
* src/mod_muc/mod_muc_room.erl: Kick non-members when room
diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl
index 9e3c43fe..d89d1756 100644
--- a/src/ejabberd_auth.erl
+++ b/src/ejabberd_auth.erl
@@ -83,14 +83,6 @@ remove_user(User, Server, Password) ->
auth_module(Server) ->
LServer = jlib:nameprep(Server),
- case ejabberd_config:get_local_option({auth_method, LServer}) of
- external ->
- ejabberd_auth_external;
- ldap ->
- ejabberd_auth_ldap;
- odbc ->
- ejabberd_auth_odbc;
- _ ->
- ejabberd_auth_internal
- end.
+ Method = ejabberd_config:get_local_option({auth_method, LServer}),
+ list_to_atom("ejabberd_auth_" ++ atom_to_list(Method)).