X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fprosodyctl.lua;h=40d21be86b617ac8a82230b88561720c28c96e10;hb=7d0d2419c6d4bb99a4bcf32f8aa866a4090a7397;hp=3b523a786bd419800b9d261c05fcdf316f5baec6;hpb=84cd85fec18079f1c684357f4d7bb7813d17a673;p=prosody.git

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 3b523a78..40d21be8 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,14 +1,30 @@
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 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;
 
 local io, os = io, os;
 local tostring, tonumber = tostring, tonumber;
+
+local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
+
+local prosody = prosody;
+
 module "prosodyctl"
 
 function adduser(params)
@@ -18,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)
@@ -53,9 +82,20 @@ function getpid()
 		return false, "no-pidfile";
 	end
 	
-	local file, err = io.open(pidfile);
+	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", ret;
+		return false, "pidfile-read-failed", err;
+	end
+	
+	local locked, err = lfs.lock(file, "w");
+	if locked then
+		file:close();
+		return false, "pidfile-not-locked";
 	end
 	
 	local pid = tonumber(file:read("*a"));
@@ -71,7 +111,7 @@ end
 function isrunning()
 	local ok, pid, err = _M.getpid();
 	if not ok then
-		if pid == "pidfile-read-failed" then
+		if pid == "pidfile-read-failed" or pid == "pidfile-not-locked" then
 			-- Report as not running, since we can't open the pidfile
 			-- (it probably doesn't exist)
 			return true, false;
@@ -91,10 +131,8 @@ function start()
 	end
 	if not CFG_SOURCEDIR then
 		os.execute("./prosody");
-	elseif CFG_SOURCEDIR:match("^/usr/local") then
-		os.execute("/usr/local/bin/prosody");
 	else
-		os.execute("prosody");
+		os.execute(CFG_SOURCEDIR.."/../../bin/prosody");
 	end
 	return true;
 end