aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-11-18 01:25:12 +0100
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-11-18 01:25:12 +0100
commitc566b1d01efe533ad6afbf1c019d346e268a5b96 (patch)
tree0621b7aa66f13e0d9f82adaacd70dfd31319f5f1 /src
parentMerge pull request #351 from weiss/floating-muc-intervals (diff)
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