From: Badlop <badlop@process-one.net>
Date: Fri, 23 Dec 2011 10:55:01 +0000 (+0100)
Subject: Always allow packets from user's server and bare jid (thanks to Alexey Shchepin)
X-Git-Tag: v3.0.0-alpha-5~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09a5fafc8a6feb49dff551b48b010f764f4db06f;p=ejabberd

Always allow packets from user's server and bare jid (thanks to Alexey Shchepin)
---

diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
index 3b741b4e7..bb9e55a5c 100644
--- a/src/mod_privacy.erl
+++ b/src/mod_privacy.erl
@@ -114,6 +114,7 @@
 	 updated_list/3]).
 
 -include_lib("exmpp/include/exmpp.hrl").
+-include_lib("exmpp/include/exmpp_jid.hrl").
 
 -include("ejabberd.hrl").
 -include("mod_privacy.hrl").
@@ -674,6 +675,27 @@ get_user_list(_, LUser, LServer)
 %% From is the sender, To is the destination.
 %% If Dir = out, User@Server is the sender account (From).
 %% If Dir = in, User@Server is the destination account (To).
+check_packet(_, _User, _Server,
+	     _UserList,
+	     {#jid{node = "", domain = Server} = _From,
+              #jid{domain = Server} = _To,
+              _},
+	     in) ->
+    allow;
+check_packet(_, _User, _Server,
+	     _UserList,
+	     {#jid{domain = Server} = _From,
+              #jid{node = "", domain = Server} = _To,
+              _},
+	     out) ->
+    allow;
+check_packet(_, _User, _Server,
+	     _UserList,
+	     {#jid{node = User, domain = Server} = _From,
+              #jid{node = User, domain = Server} = _To,
+              _},
+	     _Dir) ->
+    allow;
 check_packet(_, User, Server,
 	     #userlist{list = List, needdb = NeedDb},
 	     {From, To, #xmlel{name = PName} = El},