aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-06-15 09:08:02 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-06-15 09:08:02 +0500
commit20e4e09b0e2206f3d5c2ced0dacaf926ff151d12 (patch)
treed1689143bbefd412b0ada10d554de75329d478ac
parentd2d66b4078a2773204a0d9ee891416a81983a818 (diff)
downloadprosody-20e4e09b0e2206f3d5c2ced0dacaf926ff151d12.tar.gz
prosody-20e4e09b0e2206f3d5c2ced0dacaf926ff151d12.zip
mod_auth_internal_hashed: Removed all checks for Cyrus SASL.
-rw-r--r--plugins/mod_auth_internal_hashed.lua6
1 files changed, 0 insertions, 6 deletions
diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index ecf354c9..f8e9b00c 100644
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -28,8 +28,6 @@ local sha1 = require "util.hashes".sha1;
local prosody = _G.prosody;
-local is_cyrus = usermanager.is_cyrus;
-
-- Default; can be set per-user
local iteration_count = 4096;
@@ -38,7 +36,6 @@ function new_hashpass_provider(host)
log("debug", "initializing hashpass authentication provider for host '%s'", host);
function provider.test_password(username, password)
- if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
local credentials = datamanager.load(username, host, "accounts") or {};
if credentials.password ~= nil and string.len(credentials.password) ~= 0 then
@@ -80,7 +77,6 @@ function new_hashpass_provider(host)
end
function provider.set_password(username, password)
- if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
local account = datamanager.load(username, host, "accounts");
if account then
account.salt = account.salt or generate_uuid();
@@ -99,7 +95,6 @@ function new_hashpass_provider(host)
end
function provider.user_exists(username)
- if is_cyrus(host) then return true; end
local account = datamanager.load(username, host, "accounts");
if not account then
log("debug", "account not found for username '%s' at host '%s'", username, module.host);
@@ -113,7 +108,6 @@ function new_hashpass_provider(host)
end
function provider.create_user(username, password)
- if is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
local salt = generate_uuid();
local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, salt, iteration_count);
local stored_key_hex = stored_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);