Software /
code /
prosody
Diff
prosodyctl @ 6326:a3b9496673ee
Merge 0.9->0.10
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 31 Jul 2014 07:11:54 +0100 |
parent | 6162:fbc3b195dab8 |
parent | 6325:13a43fe90d9f |
child | 6367:769a3577dd85 |
line wrap: on
line diff
--- a/prosodyctl Fri Jul 25 21:03:16 2014 +0200 +++ b/prosodyctl Thu Jul 31 07:11:54 2014 +0100 @@ -268,13 +268,14 @@ local show_prompt = prosodyctl.show_prompt; local read_password = prosodyctl.read_password; +local jid_split = require "util.jid".prepped_split; + local prosodyctl_timeout = (config.get("*", "prosodyctl_timeout") or 5) * 2; ----------------------- local commands = {}; local command = arg[1]; function commands.adduser(arg) - local jid_split = require "util.jid".split; if not arg[1] or arg[1] == "--help" then show_usage([[adduser JID]], [[Create the specified user account in Prosody]]); return 1; @@ -314,7 +315,6 @@ end function commands.passwd(arg) - local jid_split = require "util.jid".split; if not arg[1] or arg[1] == "--help" then show_usage([[passwd JID]], [[Set the password for the specified user account in Prosody]]); return 1; @@ -354,7 +354,6 @@ end function commands.deluser(arg) - local jid_split = require "util.jid".split; if not arg[1] or arg[1] == "--help" then show_usage([[deluser JID]], [[Permanently remove the specified user account from Prosody]]); return 1; @@ -373,7 +372,6 @@ if not hosts[host] then show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host) - show_warning("The user will not be able to log in until this is changed."); hosts[host] = make_host(host); end