diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2003-10-30 14:38:38 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2003-10-30 14:38:38 +0000 |
| commit | 23228732ec25e645af5860764c18f468cc50895d (patch) | |
| tree | c9becf8a9299ec22f67f81be6826193dcb77c14f /src | |
| parent | * src/ejabberd_listener.erl: Fixed starting of SSL connection (diff) | |
* src/ejabberd_c2s.erl: More strong check for authentificated JID
* src/mod_roster.erl: Bugfix
SVN Revision: 165
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 5 | ||||
| -rw-r--r-- | src/mod_roster.erl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 8da15d261..4ebec720f 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -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 -> diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 234df7ce4..0a8bc51ab 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -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, |