diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-05-02 21:08:06 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-05-02 21:08:06 +0200 |
| commit | 6da07d78b505f8c1b2ea36eb8595961d225ee786 (patch) | |
| tree | b6a2d9666736363260143e904b09e4865156476b /src | |
| parent | Add ability to configure server loglevel when running tests (diff) | |
| parent | Return error when blocking message to offline user (diff) | |
Merge remote-tracking branch 'processone/pr/1086'
* processone/pr/1086:
Return error when blocking message to offline user
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_sm.erl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 20b0658d..25f6ea02 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -602,15 +602,12 @@ route_message(From, To, Packet, Type) -> case Type of headline -> ok; _ -> - case ejabberd_auth:is_user_exists(LUser, LServer) of + case ejabberd_auth:is_user_exists(LUser, LServer) andalso + is_privacy_allow(From, To, Packet) of true -> - case is_privacy_allow(From, To, Packet) of - true -> - ejabberd_hooks:run(offline_message_hook, LServer, - [From, To, Packet]); - false -> ok - end; - _ -> + ejabberd_hooks:run(offline_message_hook, LServer, + [From, To, Packet]); + false -> Err = jlib:make_error_reply(Packet, ?ERR_SERVICE_UNAVAILABLE), ejabberd_router:route(To, From, Err) |