* src/ejabberd_c2s.erl: Bugfix

* src/ejabberd_auth_odbc.erl: Bugfix

SVN Revision: 515

diff --git a/ChangeLog b/ChangeLog
index 9306353a45ead1d74bc4e9da6e424b1c82ab430a..2cff6e91b352aeefdd3bc79c24214f4606727db3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05  Alexey Shchepin  <alexey@sevcom.net>
+
+       * src/ejabberd_c2s.erl: Bugfix
+
+       * src/ejabberd_auth_odbc.erl: Bugfix
+
 2006-03-04  Mickael Remond  <mickael.remond@process-one.net>
 
        * src/ejabberd_logger_h.erl: reopen-log function now rename the log

diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl
index be1c8d4dbfd8b660d447314ab33c4b7905a54b12..7b7459451bef204bcc3e9156e65e51c29b823505 100644 (file)
--- a/src/ejabberd_auth_odbc.erl
+++ b/src/ejabberd_auth_odbc.erl
@@ -35,7 +35,7 @@
 %%%----------------------------------------------------------------------
 start(Host) ->
     ChildSpec =
-       {ejabberd_odbc_sup,
+       {gen_mod:get_module_proc(Host, ejabberd_odbc_sup),
         {ejabberd_odbc_sup, start_link, [Host]},
         temporary,
         infinity,

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index b193f8a14552e12460db5d13d7275fdd03a77072..1775904dede6910e662f63f47a4e78b54c76d330 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1306,28 +1306,28 @@ presence_track(From, To, Packet, StateData) ->
            StateData#state{pres_i = I,
                            pres_a = A};
        "subscribe" ->
-           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            ejabberd_hooks:run(roster_out_subscription,
                               Server,
                               [User, Server, To, subscribe]),
+           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            StateData;
        "subscribed" ->
-           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            ejabberd_hooks:run(roster_out_subscription,
                               Server,
                               [User, Server, To, subscribed]),
+           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            StateData;
        "unsubscribe" ->
-           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            ejabberd_hooks:run(roster_out_subscription,
                               Server,
                               [User, Server, To, unsubscribe]),
+           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            StateData;
        "unsubscribed" ->
-           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            ejabberd_hooks:run(roster_out_subscription,
                               Server,
                               [User, Server, To, unsubscribed]),
+           ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
            StateData;
        "error" ->
            ejabberd_router:route(From, To, Packet),