diff options
| author | Badlop <badlop@process-one.net> | 2009-04-22 15:44:03 +0400 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-04-22 15:44:03 +0400 |
| commit | 43b59911e2f4473ce87fc067057771cf2f0b3765 (patch) | |
| tree | 491e896cab028b6eff68727363a7b76f17d7e8e3 /src/ejabberd_c2s.erl | |
| parent | 240e37c38762a6abc0cb3a966b034951534c3af7 (diff) | |
* src/cyrsasl.erl: Change API of check_password: pass a function
to generate the digest (thanks to Graham Whitted)(EJAB-863)
* src/cyrsasl_anonymous.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise
* src/ejabberd_auth.erl: Likewise
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 2033
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 762961a95..b15ebdc1b 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -257,6 +257,10 @@ wait_for_stream({xmlstreamstart, #xmlel{ns = NS} = Opening}, StateData) -> fun(U, P) -> ejabberd_auth:check_password_with_authmodule( U, Server, P) + end, + fun(U, P, D, DG) -> + ejabberd_auth:check_password_with_authmodule( + U, Server, P, D, DG) end), SASL_Mechs = [exmpp_server_sasl:feature( cyrsasl:listmech(Server))], @@ -402,9 +406,11 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> case acl:match_rule(ServerString, StateData#state.access, JID) of allow -> + DGen = fun(PW) -> + sha:sha(StateData#state.streamid ++ PW) end, case ejabberd_auth:check_password_with_authmodule( U, ServerString, P, - StateData#state.streamid, D) of + D, DGen) of {true, AuthModule} -> ?INFO_MSG( "(~w) Accepted legacy authentication for ~s by ~s", |