projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configmanager: Switch back to returning 'ok' to signal config load success - fixes...
[prosody.git]
/
prosodyctl
diff --git
a/prosodyctl
b/prosodyctl
index c7ef93edb385d0e7401bc5258437b19719044bdb..cfc5ca77a979d74268a5483455984ec2da170462 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-33,9
+33,11
@@
end
-- Global 'prosody' object
prosody = {
-- Global 'prosody' object
prosody = {
- hosts = {},
- events = require "util.events".new(),
- platform = "posix"
+ hosts = {};
+ events = require "util.events".new();
+ platform = "posix";
+ lock_globals = function () end;
+ unlock_globals = function () end;
};
local prosody = prosody;
};
local prosody = prosody;
@@
-329,7
+331,7
@@
function commands.adduser(arg)
if ok then return 0; end
if ok then return 0; end
- show_message(
error_messages[msg]
)
+ show_message(
msg
)
return 1;
end
return 1;
end