aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-05-27 12:14:05 +0200
committerKim Alvefur <zash@zash.se>2019-05-27 12:14:05 +0200
commit58b5ba4345e115ac259166cd84b6f8a42d15d0f8 (patch)
tree11248c94eefafeeb2e726b13fb690a3413e5982a
parent6fcaa64f6139a5093a328b2458ea4ac74a153d51 (diff)
parent3bf9f59c008d66f9995ff93eb204514ad852c454 (diff)
downloadprosody-58b5ba4345e115ac259166cd84b6f8a42d15d0f8.tar.gz
prosody-58b5ba4345e115ac259166cd84b6f8a42d15d0f8.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_announce.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 14bb9f3d..970a273a 100644
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -44,7 +44,7 @@ function handle_announcement(event)
return; -- Not an announcement
end
- if not is_admin(stanza.attr.from) then
+ if not is_admin(stanza.attr.from, host) then
-- Not an admin? Not allowed!
module:log("warn", "Non-admin '%s' tried to send server announcement", stanza.attr.from);
return;