X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=util%2Fprosodyctl.lua;h=40d21be86b617ac8a82230b88561720c28c96e10;hb=2cf93bbbe48b948a7aee22f172ffc1287baedd6c;hp=04d58d1d3af33d5775aafc241e37afcfcb206a72;hpb=3813f633eebc075fc0cf3db4c7da4f24f49e5bc0;p=prosody.git

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 04d58d1d..40d21be8 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -10,8 +10,10 @@
 local config = require "core.configmanager";
 local encodings = require "util.encodings";
 local stringprep = encodings.stringprep;
+local storagemanager = require "core.storagemanager";
 local usermanager = require "core.usermanager";
 local signal = require "util.signal";
+local set = require "util.set";
 local lfs = require "lfs";
 
 local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
@@ -21,6 +23,8 @@ local tostring, tonumber = tostring, tonumber;
 
 local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
 
+local prosody = prosody;
+
 module "prosodyctl"
 
 function adduser(params)
@@ -30,16 +34,29 @@ function adduser(params)
 	elseif not host then
 		return false, "invalid-hostname";
 	end
+
+	local provider = prosody.hosts[host].users;
+	if not(provider) or provider.name == "null" then
+		usermanager.initialize_host(host);
+	end
+	storagemanager.initialize_host(host);
 	
-	local ok = usermanager.create_user(user, password, host);
+	local ok, errmsg = usermanager.create_user(user, password, host);
 	if not ok then
-		return false, "unable-to-save-data";
+		return false, errmsg;
 	end
 	return true;
 end
 
 function user_exists(params)
-	return usermanager.user_exists(params.user, params.host);
+	local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
+	local provider = prosody.hosts[host].users;
+	if not(provider) or provider.name == "null" then
+		usermanager.initialize_host(host);
+	end
+	storagemanager.initialize_host(host);
+	
+	return usermanager.user_exists(user, host);
 end
 
 function passwd(params)
@@ -65,6 +82,11 @@ function getpid()
 		return false, "no-pidfile";
 	end
 	
+	local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
+	if not modules_enabled:contains("posix") then
+		return false, "no-posix";
+	end
+	
 	local file, err = io.open(pidfile, "r+");
 	if not file then
 		return false, "pidfile-read-failed", err;