aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Köhler <andreas.koehler@1und1.de>2010-09-17 16:44:48 +0200
committerBadlop <badlop@process-one.net>2010-09-17 18:48:45 +0200
commit3278f019cb91057b8981f133f7b707cb2246e26b (patch)
tree8ad5d2e02c90409d2d3af33525b250b4b1ee2356 /src
parentDiscard unmatched INFO messages in ejabberd services. (diff)
Add missing needdb check in mod_privacy, to enable blocking by group and subscription again.
Diffstat (limited to 'src')
-rw-r--r--src/mod_privacy.erl3
-rw-r--r--src/mod_privacy_odbc.erl3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
index 0c9d089e0..d25bc9b7b 100644
--- a/src/mod_privacy.erl
+++ b/src/mod_privacy.erl
@@ -392,12 +392,13 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
{atomic, {error, _} = Error} ->
Error;
{atomic, {result, _} = Res} ->
+ NeedDb = is_list_needdb(List),
ejabberd_router:route(
jlib:make_jid(LUser, LServer, ""),
jlib:make_jid(LUser, LServer, ""),
{xmlelement, "broadcast", [],
[{privacy_list,
- #userlist{name = Name, list = List},
+ #userlist{name = Name, list = List, needdb = NeedDb},
Name}]}),
Res;
_ ->
diff --git a/src/mod_privacy_odbc.erl b/src/mod_privacy_odbc.erl
index 5ad2fb958..593e99140 100644
--- a/src/mod_privacy_odbc.erl
+++ b/src/mod_privacy_odbc.erl
@@ -392,12 +392,13 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
{atomic, {error, _} = Error} ->
Error;
{atomic, {result, _} = Res} ->
+ NeedDb = is_list_needdb(List),
ejabberd_router:route(
jlib:make_jid(LUser, LServer, ""),
jlib:make_jid(LUser, LServer, ""),
{xmlelement, "broadcast", [],
[{privacy_list,
- #userlist{name = Name, list = List},
+ #userlist{name = Name, list = List, needdb = NeedDb},
Name}]}),
Res;
_ ->