lslogins: align usage() and manual with struct option longopts

Short option -G goes together with long option --supp-groups, while
neither of -m or --groups-info has worked in a release so remove them
from usage() and manual.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/login-utils/lslogins.1 b/login-utils/lslogins.1
index 0a9e70357d487bddf39a680a52ed04e43590432d..0dbeebdb98eb1e718e81d4ba6af601bcd5cebd42 100644 (file)
--- a/login-utils/lslogins.1
+++ b/login-utils/lslogins.1
@@ -31,7 +31,7 @@ Output data in the format of NAME=VALUE.
 \fB\-f\fR, \fB\-\-failed\fR
 Display data about the users' last failed login attempts.
 .TP
-\fB\-G\fR, \fB\-\-groups\-info\fR
+\fB\-G\fR, \fB\-\-supp\-groups\fR
 Show information about groups.
 .TP
 \fB\-g\fR, \fB\-\-groups\fR=\fIgroups\fR
@@ -48,9 +48,6 @@ Display data containing information about the users' last login sessions.
 Only show data of users with a login specified in \fIlogins\fR (user names or user
 IDS).  More than one login may be specified; the list has to be comma-separated.
 .TP
-\fB\-m\fR, \fB\-\-supp\-groups\fR
-Show supplementary groups.
-.TP
 \fB\-n\fR, \fB\-\-newline\fR
 Display each piece of information on a separate line.
 .TP

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index 38d3cf681ac4b520e2c718bf46905ed69040f6e9..abce949c16f44019e033b056781092c58455860e 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1189,11 +1189,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        fputs(_(" -c, --colon-separate     display data in a format similar to /etc/passwd\n"), out);
        fputs(_(" -e, --export             display in an export-able output format\n"), out);
        fputs(_(" -f, --failed             display data about the users' last failed logins\n"), out);
-       fputs(_(" -G, --groups-info        display information about groups\n"), out);
+       fputs(_(" -G, --supp-groups        display information about groups\n"), out);
        fputs(_(" -g, --groups=<groups>    display users belonging to a group in <groups>\n"), out);
        fputs(_(" -L, --last               show info about the users' last login sessions\n"), out);
        fputs(_(" -l, --logins=<logins>    display only users from <logins>\n"), out);
-       fputs(_(" -m, --supp-groups        display supplementary groups as well\n"), out);
        fputs(_(" -n, --newline            display each piece of information on a new line\n"), out);
        fputs(_("     --noheadings         don't print headings\n"), out);
        fputs(_("     --notruncate         don't truncate output\n"), out);