summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorRuss Allbery <rra@dropbox.com>2016-07-27 15:27:37 -0700
committerRuss Allbery <rra@dropbox.com>2016-07-27 15:27:37 -0700
commit2ccd54fc94920c73764140122761150e94f72ef3 (patch)
tree86072b9dee66bf80c06129b16685132fb60360e6 /server
parent68f003b4c913728f011678e0a68bbb5d4fd9701a (diff)
Add -q and ACL methods to remctl-shell usage
Add the -q flag added in a previous commit to the usage text, and add the same information about ACL methods that is printed by remctld -h.
Diffstat (limited to 'server')
-rw-r--r--server/remctl-shell.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/server/remctl-shell.c b/server/remctl-shell.c
index 226f71e..7b288c0 100644
--- a/server/remctl-shell.c
+++ b/server/remctl-shell.c
@@ -34,11 +34,14 @@ Options:\n\
-d Log verbose debugging information\n\
-f <file> Config file (default: " CONFIG_FILE ")\n\
-h Display this help\n\
+ -q Suppress informational logging (such as the command run)\n\
-S Log to standard output/error rather than syslog\n\
\n\
This is meant to be used as the shell for a dedicated account and handles\n\
incoming commands via ssh. It must be run under ssh or with the same\n\
-environment variables ssh would set.\n";
+environment variables ssh would set.\n\
+\n\
+Supported ACL methods: file, princ, deny";
/*
@@ -53,6 +56,19 @@ usage(int status)
if (status != 0)
fprintf(output, "\n");
fprintf(output, usage_message);
+#ifdef HAVE_GPUT
+ fprintf(output, ", gput");
+#endif
+#if defined(HAVE_KRB5) && defined(HAVE_GETGRNAM_R)
+ fprintf(output, ", localgroup");
+#endif
+#ifdef HAVE_PCRE
+ fprintf(output, ", pcre");
+#endif
+#ifdef HAVE_REGCOMP
+ fprintf(output, ", regex");
+#endif
+ fprintf(output, "\n");
exit(status);
}
@@ -92,7 +108,7 @@ main(int argc, char *argv[])
* Parse options. Since we're being run as a shell, there isn't all that
* much here.
*/
- while ((option = getopt(argc, argv, "dc:f:hqS")) != EOF) {
+ while ((option = getopt(argc, argv, "c:df:hqS")) != EOF) {
switch (option) {
case 'c':
command_string = optarg;