aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvgeny Khramtsov <xramtsov@gmail.com>2014-11-25 14:20:01 +0300
committerEvgeny Khramtsov <xramtsov@gmail.com>2014-11-25 14:20:01 +0300
commit6b916e7a042a6a5fc8a844b67295bf99b5872741 (patch)
tree689452c4b072670e04b84ebc1cddd2a060d1e4c6 /src
parentMerge pull request #352 from weiss/no-last-pep-duplicates (diff)
parentRespect privacy lists for incoming PEP messages (diff)
Merge pull request #354 from weiss/pep-privacy
Respect privacy lists for incoming PEP messages
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_c2s.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index c0b042ec6..3bb8a04ac 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1755,7 +1755,13 @@ handle_info({send_filtered, Feature, From, To, Packet}, StateName, StateData) ->
FinalPacket = jlib:replace_from_to(From, To, Packet),
case StateData#state.jid of
To ->
- send_packet(StateData, FinalPacket);
+ case privacy_check_packet(StateData, From, To,
+ FinalPacket, in) of
+ deny ->
+ StateData;
+ allow ->
+ send_stanza(StateData, FinalPacket)
+ end;
_ ->
ejabberd_router:route(From, To, FinalPacket),
StateData