From: Karel Zak Date: Mon, 1 Jun 2020 08:33:29 +0000 (+0200) Subject: login: cleanup -f in usage() and comments X-Git-Tag: v2.36-rc1~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a43769294387d840c63a18b2f97afdc0bef08905;p=thirdparty%2Futil-linux.git login: cleanup -f in usage() and comments Let's remove unnecessary comment and "second authentication" from usage(). Addresses: https://github.com/karelzak/util-linux/issues/1053 Signed-off-by: Karel Zak --- diff --git a/login-utils/login.c b/login-utils/login.c index 4be8bcfaf3..b3aab91071 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -1178,7 +1178,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_OPTIONS, stdout); puts(_(" -p do not destroy the environment")); - puts(_(" -f skip a second login authentication")); + puts(_(" -f skip a login authentication")); puts(_(" -h hostname to be used for utmp logging")); puts(_(" -H suppress hostname in the login prompt")); printf(" --help %s\n", USAGE_OPTSTR_HELP); @@ -1240,12 +1240,6 @@ int main(int argc, char **argv) setpriority(PRIO_PROCESS, 0, 0); initproctitle(argc, argv); - /* - * -p is used by getty to tell login not to destroy the environment - * -f is used to skip a second login authentication - * -h is used by other servers to pass the name of the remote - * host to login so that it may be placed in utmp and wtmp - */ while ((c = getopt_long(argc, argv, "fHh:pV", longopts, NULL)) != -1) switch (c) { case 'f':