mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-14 22:00:16 +02:00
Fixed error replying on blocked messages
This commit is contained in:
parent
e8576c23c5
commit
fd54181435
|
@ -1680,11 +1680,16 @@ handle_info({route, From, To,
|
|||
of
|
||||
allow -> {true, Attrs, StateData};
|
||||
deny ->
|
||||
case xml:get_attr_s(<<"type">>, Attrs) of
|
||||
<<"error">> -> ok;
|
||||
<<"result">> -> ok;
|
||||
_ ->
|
||||
Err =
|
||||
jlib:make_error_reply(Packet,
|
||||
?ERR_SERVICE_UNAVAILABLE),
|
||||
ejabberd_router:route(To, From,
|
||||
Err),
|
||||
Err)
|
||||
end,
|
||||
{false, Attrs, StateData}
|
||||
end;
|
||||
_ -> {true, Attrs, StateData}
|
||||
|
@ -2177,7 +2182,8 @@ check_privacy_route(From, StateData, FromRoute, To,
|
|||
"the routing of this stanza.">>,
|
||||
Err = jlib:make_error_reply(Packet,
|
||||
?ERRT_NOT_ACCEPTABLE(Lang, ErrText)),
|
||||
ejabberd_router:route(To, From, Err),
|
||||
Err2 = jlib:replace_from_to(To, From, Err),
|
||||
send_element(StateData, Err2),
|
||||
ok;
|
||||
allow -> ejabberd_router:route(FromRoute, To, Packet)
|
||||
end.
|
||||
|
|
Loading…
Reference in New Issue
Block a user