X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_auth_anonymous.lua;h=8d790508d4d880f19a4442d41438bed8dd046fce;hb=refs%2Fheads%2Fnohangouts-0.8.2;hp=214611d819acdb5526660e4ea8c83c46338420ba;hpb=3456013cbd8feceb716f55c4c71762c585854151;p=prosody.git

diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua
index 214611d8..8d790508 100644
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -1,17 +1,12 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- Copyright (C) 2010 Jeff Mitchell
 --
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
-local log = require "util.logger".init("usermanager");
-local type = type;
-local ipairs = ipairs;
-local jid_bare = require "util.jid".bare;
-local config = require "core.configmanager";
+local log = require "util.logger".init("auth_anonymous");
 local new_sasl = require "util.sasl".new;
 local datamanager = require "util.datamanager";
 
@@ -25,7 +20,7 @@ function new_default_provider(host)
 	function provider.get_password(username)
 		return nil, "Password not available.";
 	end
-	
+
 	function provider.set_password(username, password)
 		return nil, "Password based auth not supported.";
 	end
@@ -39,27 +34,14 @@ function new_default_provider(host)
 	end
 
 	function provider.get_sasl_handler()
-		local realm = module:get_option("sasl_realm") or module.host;
 		local anonymous_authentication_profile = {
-			anonymous = function(username, realm)
+			anonymous = function(sasl, username, realm)
 				return true; -- for normal usage you should always return true here
 			end
 		};
-		return new_sasl(realm, anonymous_authentication_profile);
+		return new_sasl(module.host, anonymous_authentication_profile);
 	end
 
-	function provider.is_admin(jid)
-		local admins = config.get(host, "core", "admins");
-		if admins ~= config.get("*", "core", "admins") and type(admins) == "table" then
-			jid = jid_bare(jid);
-			for _,admin in ipairs(admins) do
-				if admin == jid then return true; end
-			end
-		elseif admins then
-			log("error", "Option 'admins' for host '%s' is not a table", host);
-		end
-		return is_admin(jid); -- Test whether it's a global admin instead
-	end
 	return provider;
 end