From 22f6dcb47c32909ca0a3d720b11df5ea86b1e76c Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 26 Sep 2006 16:31:01 +0000 Subject: login: fix getopt_ulflags fallout (wasn't taking username supplied by getty) --- loginutils/login.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'loginutils/login.c') diff --git a/loginutils/login.c b/loginutils/login.c index 0157bace8..1b13fa0cc 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -235,13 +235,13 @@ int login_main(int argc, char **argv) alarm(TIMEOUT); opt = bb_getopt_ulflags(argc, argv, "f:h:p", &opt_user, &opt_host); - if (opt & LOGIN_OPT_f) { if (!amroot) bb_error_msg_and_die("-f is for root only"); - safe_strncpy(username, opt_user, strlen(opt_user)); + safe_strncpy(username, opt_user, sizeof(username)); } - username[USERNAME_SIZE] = 0; + if (optind < argc) /* user from command line (getty) */ + safe_strncpy(username, argv[optind], sizeof(username)); /* Let's find out and memorize our tty */ if (!isatty(0) || !isatty(1) || !isatty(2)) -- cgit v1.2.1