projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_s2s: Detect TLS compression
[prosody.git]
/
util
/
prosodyctl.lua
diff --git
a/util/prosodyctl.lua
b/util/prosodyctl.lua
index 2da39cb2fa2c14df4fd63a2602cc0d8c0f378896..e38f85d47a26ea5a6d0e24e5dbea7ebb0cfde0a9 100644
(file)
--- a/
util/prosodyctl.lua
+++ b/
util/prosodyctl.lua
@@
-16,6
+16,7
@@
local signal = require "util.signal";
local set = require "util.set";
local lfs = require "lfs";
local pcall = pcall;
local set = require "util.set";
local lfs = require "lfs";
local pcall = pcall;
+local type = type;
local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
@@
-63,6
+64,13
@@
function getchar(n)
end
end
end
end
+function getline()
+ local ok, line = pcall(io.read, "*l");
+ if ok then
+ return line;
+ end
+end
+
function getpass()
local stty_ret = os.execute("stty -echo 2>/dev/null");
if stty_ret ~= 0 then
function getpass()
local stty_ret = os.execute("stty -echo 2>/dev/null");
if stty_ret ~= 0 then
@@
-112,6
+120,13
@@
function read_password()
return password;
end
return password;
end
+function show_prompt(prompt)
+ io.write(prompt, " ");
+ local line = getline();
+ line = line and line:gsub("\n$","");
+ return (line and #line > 0) and line or nil;
+end
+
-- Server control
function adduser(params)
local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
-- Server control
function adduser(params)
local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
@@
-161,9
+176,9
@@
function deluser(params)
if not _M.user_exists(params) then
return false, "no-such-user";
end
if not _M.user_exists(params) then
return false, "no-such-user";
end
-
params.password = nil
;
+
local user, host = nodeprep(params.user), nameprep(params.host)
;
- return
_M.adduser(params
);
+ return
usermanager.delete_user(user, host
);
end
function getpid()
end
function getpid()
@@
-258,3
+273,5
@@
function reload()
signal.kill(pid, signal.SIGHUP);
return true;
end
signal.kill(pid, signal.SIGHUP);
return true;
end
+
+return _M;