summaryrefslogtreecommitdiffabout
path: root/src/ctl.c
authorSergey Poznyakoff <gray@gnu.org.ua>2015-12-17 12:50:34 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2015-12-17 12:53:21 (GMT)
commit0ac42500ecdfe289b44d0d7ac10ff302e48aef5c (patch) (side-by-side diff)
treeff1d0be679e935256167972034b7f88f9157f010 /src/ctl.c
parentf928d00f38cc8a43f31506fadf868ba72ca93b4d (diff)
downloadpies-0ac42500ecdfe289b44d0d7ac10ff302e48aef5c.tar.gz
pies-0ac42500ecdfe289b44d0d7ac10ff302e48aef5c.tar.bz2
Fixes
* src/ctl.c: Make "id" command accessible only to administrators (cmd_id): Print PID. (ctlio_do_command): Reword 510 text. * src/pies.c (config_file): Remove "next" (conf_head, conf_tail): Remove. Use grecs_list instead. All uses changed.
Diffstat (limited to 'src/ctl.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/ctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ctl.c b/src/ctl.c
index f422e4b..bd8fa53 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -141,7 +141,7 @@ static struct ctlio_command cmdtab[] = {
{ "noop", "no operation",
CTL_ALL_STATES, 1, 1, cmd_noop },
{ "id", "identify the instance",
- CTL_AUTHENTICATED_STATE, 1, 1, cmd_id },
+ CTL_ADMIN_STATE, 1, 1, cmd_id },
{ "quit", "quit the session",
CTL_ALL_STATES, 1, 1, cmd_quit },
{ "help", "display help",
@@ -300,7 +300,7 @@ ctlio_do_command (struct ctlio *io)
}
if (!(cmd->states & io->state))
{
- ctlio_reply (io, "510", "command not valid in state");
+ ctlio_reply (io, "510", "permission denied");
return;
}
if (cmd->minargs && io->ws.ws_wordc < cmd->minargs)
@@ -442,6 +442,7 @@ cmd_id (struct ctlio *io, size_t argc, char **argv)
#if HAVE_DECL_PROGRAM_INVOCATION_NAME
ctlio_printf (io, "Binary: %s%s", program_invocation_name, CRLF);
#endif
+ ctlio_printf (io, "PID: %lu%s", (unsigned long) getpid (), CRLF);
ctlio_printf (io, "Instance: %s%s", instance, CRLF);
ctlio_eot (io);
}

Return to:

Send suggestions and report system problems to the System administrator.