mod_tls: Respond with proper error when TLS cannot be negotiated.

[prosody.git] / plugins / mod_announce.lua

diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 5ea61e286553e50edeb81f9fc29039f91c4539e1..118ba13d3a56e50243ab1bf8f184526c359afbb3 100644 (file)
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local st, jid, set = require "util.stanza", require "util.jid", require "util.set";
 
 local is_admin = require "core.usermanager".is_admin;
@@ -11,9 +19,9 @@ function handle_announcement(data)
                return; -- Not an announcement
        end
        
-       if not is_admin(origin.full_jid) then
+       if not is_admin(stanza.attr.from) then
                -- Not an admin? Not allowed!
-               module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(origin.full_jid)));
+               module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
                origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                return;
        end