From 330733eadf76ea87ee8714ed7958f174b1be21db Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sat, 28 Nov 2009 16:29:41 -0800 Subject: improve command prohibition error report Ensures that the correct information gets displayed, depending on the mode of the command being denied. Fixes misreporting all commands as needing to run "before 'init'". --- src/helper/command.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/helper/command.c b/src/helper/command.c index 9b9c5ec0..dcad6a19 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -565,8 +565,16 @@ static int run_command(struct command_context *context, { if (!command_can_run(context, c)) { - /* Config commands can not run after the config stage */ - LOG_ERROR("The '%s' command must be used before 'init'.", c->name); + /* Many commands may be run only before/after 'init' */ + const char *when; + switch (c->mode) { + case COMMAND_CONFIG: when = "before"; break; + case COMMAND_EXEC: when = "after"; break; + // handle the impossible with humor; it guarantees a bug report! + default: when = "if Cthulhu is summoned by"; break; + } + LOG_ERROR("The '%s' command must be used %s 'init'.", + c->name, when); return ERROR_FAIL; } -- cgit v1.2.3