aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-10 13:33:14 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-10 13:33:14 +0000
commitc028aceb9f3bda3ad8f46dada4a7e38381ee60f2 (patch)
treed8072d5a4fca6bee73355782f37ced43fb3a4932
parent2f5368193dd206e1a8734373e9251569bc24ae40 (diff)
downloadprosody-c028aceb9f3bda3ad8f46dada4a7e38381ee60f2.tar.gz
prosody-c028aceb9f3bda3ad8f46dada4a7e38381ee60f2.zip
prosody: Don't silently ignore unknown command-line options
-rwxr-xr-xprosody6
1 files changed, 6 insertions, 0 deletions
diff --git a/prosody b/prosody
index 47998583..a2cb0e6c 100755
--- a/prosody
+++ b/prosody
@@ -43,6 +43,12 @@ if CFG_DATADIR then
end
end
+if #arg > 0 and arg[1] ~= "--config" then
+ print("Unknown command-line option: "..tostring(arg[1]));
+ print("Perhaps you meant to use prosodyctl instead?");
+ return 1;
+end
+
-- Global 'prosody' object
local prosody = { events = require "util.events".new(); };
_G.prosody = prosody;