From 51238bff833299bae7c40e0ac744b5f50f81092b Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Fri, 6 May 2016 13:59:21 +0200
Subject: [PATCH] Bounce messages sent to server JID

If a message is sent to the server JID (without node part), generate an
error message rather than dropping the message silently.
---
 src/ejabberd_local.erl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl
index 5566073e9..2ba943693 100644
--- a/src/ejabberd_local.erl
+++ b/src/ejabberd_local.erl
@@ -271,7 +271,16 @@ do_route(From, To, Packet) ->
 	   #xmlel{name = Name} = Packet,
 	   case Name of
 	     <<"iq">> -> process_iq(From, To, Packet);
-	     <<"message">> -> ok;
+	     <<"message">> ->
+		 #xmlel{attrs = Attrs} = Packet,
+		 case fxml:get_attr_s(<<"type">>, Attrs) of
+		   <<"headline">> -> ok;
+		   <<"error">> -> ok;
+		   _ ->
+		       Err = jlib:make_error_reply(Packet,
+						   ?ERR_SERVICE_UNAVAILABLE),
+		       ejabberd_router:route(To, From, Err)
+		 end;
 	     <<"presence">> -> ok;
 	     _ -> ok
 	   end;