From 1c4cc57e3f979dbd8a2688f6610713958cca4f0a Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Thu, 5 Nov 2009 17:36:54 +0000 Subject: [PATCH] fix root node deletion match SVN Revision: 2730 --- src/mod_pubsub/mod_pubsub.erl | 2 +- src/mod_pubsub/mod_pubsub_odbc.erl | 2 +- src/mod_pubsub/pubsub_odbc.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 724aaf226..af411e782 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -1847,7 +1847,7 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) -> %%
  • The node is the root collection node, which cannot be deleted.
    • %%
  • The specified node does not exist.
    • %% -delete_node(_Host, [], _Owner) -> +delete_node(_Host, <<>>, _Owner) -> %% Node is the root {error, 'not-allowed'}; delete_node(Host, Node, Owner) -> diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index 4043f04e4..97ab54ad9 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.erl @@ -1658,7 +1658,7 @@ create_node(Host, ServerHost, Node, Owner, GivenType, Access, Configuration) -> %%
  • The node is the root collection node, which cannot be deleted.
    • %%
  • The specified node does not exist.
    • %% -delete_node(_Host, [], _Owner) -> +delete_node(_Host, <<>>, _Owner) -> %% Node is the root {error, 'not-allowed'}; delete_node(Host, Node, Owner) -> diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch index 731f57041..c70d0e942 100644 --- a/src/mod_pubsub/pubsub_odbc.patch +++ b/src/mod_pubsub/pubsub_odbc.patch @@ -1,5 +1,5 @@ ---- mod_pubsub.erl 2009-11-04 20:44:13.000000000 +0100 -+++ mod_pubsub_odbc.erl 2009-11-04 20:44:13.000000000 +0100 +--- mod_pubsub.erl 2009-11-05 18:37:16.000000000 +0100 ++++ mod_pubsub_odbc.erl 2009-11-05 18:37:21.000000000 +0100 @@ -42,7 +42,7 @@ %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% XEP-0060 section 12.18.