Fix regression for authorize node subscription (thanks to Brian Cully)(EJAB-1060)

SVN Revision: 2651

diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl
index c1c2a55f63b8c7dcb85daaf51651f7c708be0d76..d557a1a10ea38a3de6089684327680c5b1f3302f 100644 (file)
--- 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 d9e2a815a76a6b3cbd663673bc714fe222db10e7..b4ac3fec7ab08d97d84e60ca3512755c973e4443 100644 (file)
--- 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};