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

* src/mod_roster.erl: Bugfix

SVN Revision: 165

diff --git a/ChangeLog b/ChangeLog
index 6319f4a9e332217e86a5743db01fe4892f7f0f10..5bbc9b0f7dd34c28cd3d44b13f3aa805a5cb1896 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 8da15d261ad4e56cc5bfc41e77ceef4f87e3704c..4ebec720f379e3372b6b9715ca2aa32a533a4bc5 100644 (file)
--- 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 234df7ce4f1c83144d04197afdaa52ab34d11c2f..0a8bc51ab0da65ae3d1f4d490a2f47286ddd45c9 100644 (file)
--- 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,