* src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549)

SVN Revision: 1454

diff --git a/ChangeLog b/ChangeLog
index a14d930bbc189f950df74d7a51732ab8b3fdc281..49be95d26fbaa8fa9bacd4d6bb5ea349f96fd551 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-07-16  Badlop  <badlop@process-one.net>
 
+       * src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549)
+
        * src/*.hrl: Get back all ejabberd header files to their original
        placement in src/ subdirectories (EJAB-696)
        * src/*/*.erl: Likewise

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 358b1fe32965259d5204de973592c9ab9e396436..ebd712916174d29d79aa395bc79d6447b19aa6f2 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1461,7 +1461,8 @@ presence_update(From, Packet, StateData) ->
                         StatusTag ->
                            xml:get_tag_cdata(StatusTag)
                     end,
-           Info = [{ip, StateData#state.ip},{conn, StateData#state.conn}],
+           Info = [{ip, StateData#state.ip}, {conn, StateData#state.conn},
+                   {auth_module, StateData#state.auth_module}],
            ejabberd_sm:unset_presence(StateData#state.sid,
                                       StateData#state.user,
                                       StateData#state.server,
@@ -1795,7 +1796,8 @@ roster_change(IJID, ISubscription, StateData) ->
 
 
 update_priority(Priority, Packet, StateData) ->
-    Info = [{ip, StateData#state.ip},{conn, StateData#state.conn}],
+    Info = [{ip, StateData#state.ip}, {conn, StateData#state.conn},
+           {auth_module, StateData#state.auth_module}],
     ejabberd_sm:set_presence(StateData#state.sid,
                             StateData#state.user,
                             StateData#state.server,