25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

* src/ejabberd_c2s.erl: More strong check for authentificated JID

* src/mod_roster.erl: Bugfix

SVN Revision: 165
This commit is contained in:
Alexey Shchepin 2003-10-30 14:38:38 +00:00
parent 23b3779b20
commit 23228732ec
3 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2003-10-30 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: More strong check for authentificated JID
* src/mod_roster.erl: Bugfix
2003-10-29 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_listener.erl: Fixed starting of SSL connection

View File

@ -208,8 +208,9 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
{auth, ID, set, {U, P, D, R}} ->
io:format("AUTH: ~p~n", [{U, P, D, R}]),
JID = jlib:make_jid(U, StateData#state.server, R),
case acl:match_rule(StateData#state.access, JID) of
allow ->
case (JID /= error) andalso
(acl:match_rule(StateData#state.access, JID) == allow) of
true ->
case ejabberd_auth:check_password(
U, P, StateData#state.streamid, D) of
true ->

View File

@ -415,7 +415,7 @@ in_subscription(User, From, Type) ->
{atomic, false} ->
false;
{atomic, {update, Presence, Item}} ->
ejabberd_router:route({User, ?MYNAME, ""},
ejabberd_router:route(jlib:make_jid(User, ?MYNAME, ""),
jlib:jid_replace_resource(From, ""),
Presence),
ejabberd_sm ! {route,