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
commited3b57fd194ee4eebfccf5f09e3ac55011eda5a1 (patch)
treed8072d5a4fca6bee73355782f37ced43fb3a4932
parent60ccccb95986f320717601ba0c485832d2e753fd (diff)
downloadprosody-ed3b57fd194ee4eebfccf5f09e3ac55011eda5a1.tar.gz
prosody-ed3b57fd194ee4eebfccf5f09e3ac55011eda5a1.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;