aboutsummaryrefslogtreecommitdiff
path: root/src/mod_pubsub
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-10-09 12:00:20 +0000
committerBadlop <badlop@process-one.net>2009-10-09 12:00:20 +0000
commit3e9e967429c1ee03cb26c61f25616c76283f9240 (patch)
treef4017cb94b756f03c715fa116b7e49e8f9f2fe9c /src/mod_pubsub
parentAdd debug message on command execution (diff)
Fix regression for authorize node subscription (thanks to Brian Cully)(EJAB-1060)
SVN Revision: 2651
Diffstat (limited to 'src/mod_pubsub')
-rw-r--r--src/mod_pubsub/node_hometree.erl3
-rw-r--r--src/mod_pubsub/node_hometree_odbc.erl3
2 files changed, 0 insertions, 6 deletions
diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl
index c1c2a55f6..d557a1a10 100644
--- a/src/mod_pubsub/node_hometree.erl
+++ b/src/mod_pubsub/node_hometree.erl
@@ -312,9 +312,6 @@ subscribe_node(NodeId, Sender, Subscriber, AccessModel,
(AccessModel == whitelist) and (not Whitelisted) ->
%% Node has whitelist access model and entity lacks required affiliation
{error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")};
- (AccessModel == authorize) -> % TODO: to be done
- %% Node has authorize access model
- {error, ?ERR_FORBIDDEN};
%%MustPay ->
%% % Payment is required for a subscription
%% {error, ?ERR_PAYMENT_REQUIRED};
diff --git a/src/mod_pubsub/node_hometree_odbc.erl b/src/mod_pubsub/node_hometree_odbc.erl
index d9e2a815a..b4ac3fec7 100644
--- a/src/mod_pubsub/node_hometree_odbc.erl
+++ b/src/mod_pubsub/node_hometree_odbc.erl
@@ -319,9 +319,6 @@ subscribe_node(NodeId, Sender, Subscriber, AccessModel,
(AccessModel == whitelist) and (not Whitelisted) ->
%% Node has whitelist access model and entity lacks required affiliation
{error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")};
- (AccessModel == authorize) -> % TODO: to be done
- %% Node has authorize access model
- {error, ?ERR_FORBIDDEN};
%%MustPay ->
%% % Payment is required for a subscription
%% {error, ?ERR_PAYMENT_REQUIRED};