Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Fix acl:match_rule/3 call. It takes a #jid record, not a short JID.

Browse Source 
PR:		EJABP-1

SVN Revision: 1708
This commit is contained in:
Jean-Sébastien Pédron 2008-12-08 11:20:21 +00:00
parent 163d185776
commit d01c24bd23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-05 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/mod_pubsub/node_default.erl, src/mod_pubsub/node_pep.erl: Fix
acl:match_rule/3 call. It takes a #jid record, not a short JID.
2008-12-05 Jean-Sébastien Pédron <js.pedron@meetic-corp.com> 2008-12-05 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/ejabberd_receiver.erl, src/mod_offline_odbc.erl, * src/ejabberd_receiver.erl, src/mod_offline_odbc.erl,

3
src/mod_pubsub/node_default.erl
View File

@ -201,7 +201,8 @@ create_node_permission(Host, ServerHost, Node, _ParentNode, Owner, Access) ->
{undefined, Host, undefined} -> {undefined, Host, undefined} ->
true; % pubsub service always allowed true; % pubsub service always allowed
_ -> _ ->
case acl:match_rule(ServerHost, Access, LOwner) of {LU, LS, LR} = LOwner,
case acl:match_rule(ServerHost, Access, exmpp_jid:make_jid(LU, LS, LR)) of
allow -> allow ->
case Node of case Node of
["home", Server, User | _] -> true; ["home", Server, User | _] -> true;

3
src/mod_pubsub/node_pep.erl
View File

@ -118,7 +118,8 @@ create_node_permission(Host, ServerHost, _Node, _ParentNode, Owner, Access) ->
{undefined, Host, undefined} -> {undefined, Host, undefined} ->
true; % pubsub service always allowed true; % pubsub service always allowed
_ -> _ ->
case acl:match_rule(ServerHost, Access, LOwner) of {LU, LS, LR} = LOwner,
case acl:match_rule(ServerHost, Access, exmpp_jid:make_jid(LU, LS, LR)) of
allow -> allow ->
case Host of case Host of
{User, Server, _} -> true; {User, Server, _} -> true;