summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-07-16 18:05:46 +0000
committerBadlop <badlop@process-one.net>2008-07-16 18:05:46 +0000
commitbe140c1a23d94ef5c09d3949a42657b71df963e0 (patch)
tree4c802b339c5bb8fc87645a7ee4e54d035724e1c5
parent* src/*.hrl: Get back all ejabberd header files to their original (diff)
* src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549)
SVN Revision: 1454
Diffstat (limited to '')
-rw-r--r--ChangeLog2
-rw-r--r--src/ejabberd_c2s.erl6
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a14d930b..49be95d2 100644
--- 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 358b1fe3..ebd71291 100644
--- 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,