diff options
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/addgroup.c | 8 | ||||
| -rw-r--r-- | loginutils/login.c | 7 | ||||
| -rw-r--r-- | loginutils/sulogin.c | 7 |
3 files changed, 11 insertions, 11 deletions
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index 31e507045..b25f8171d 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c @@ -123,7 +123,7 @@ static void add_user_to_group(char **args, * will add an existing user to an existing group. */ int addgroup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int addgroup_main(int argc, char **argv) +int addgroup_main(int argc ATTRIBUTE_UNUSED, char **argv) { char *group; gid_t gid = 0; @@ -144,10 +144,10 @@ int addgroup_main(int argc, char **argv) } /* move past the commandline options */ argv += optind; - argc -= optind; + //argc -= optind; #if ENABLE_FEATURE_ADDUSER_TO_GROUP - if (argc == 2) { + if (argv[1]) { struct group *gr; if (option_mask32) { @@ -170,7 +170,7 @@ int addgroup_main(int argc, char **argv) add_user_to_group(argv, bb_path_group_file, xfopen); #if ENABLE_FEATURE_SHADOWPASSWDS add_user_to_group(argv, bb_path_gshadow_file, fopen_or_warn); -#endif /* ENABLE_FEATURE_SHADOWPASSWDS */ +#endif } else #endif /* ENABLE_FEATURE_ADDUSER_TO_GROUP */ new_group(argv[0], gid); diff --git a/loginutils/login.c b/loginutils/login.c index d7eb8d35b..e8fe74e16 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -221,7 +221,7 @@ static void alarm_handler(int sig ATTRIBUTE_UNUSED) } int login_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int login_main(int argc, char **argv) +int login_main(int argc ATTRIBUTE_UNUSED, char **argv) { enum { LOGIN_OPT_f = (1<<0), @@ -269,8 +269,9 @@ int login_main(int argc, char **argv) bb_error_msg_and_die("-f is for root only"); safe_strncpy(username, opt_user, sizeof(username)); } - if (optind < argc) /* user from command line (getty) */ - safe_strncpy(username, argv[optind], sizeof(username)); + argv += optind; + if (argv[0]) /* user from command line (getty) */ + safe_strncpy(username, argv[0], sizeof(username)); /* Let's find out and memorize our tty */ if (!isatty(0) || !isatty(1) || !isatty(2)) diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index caa1a8335..17bb15efa 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -19,7 +19,6 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) { char *cp; int timeout = 0; - char *timeout_arg; struct passwd *pwd; const char *shell; #if ENABLE_FEATURE_SHADOWPASSWDS @@ -31,9 +30,8 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) logmode = LOGMODE_BOTH; openlog(applet_name, 0, LOG_AUTH); - if (getopt32(argv, "t:", &timeout_arg)) { - timeout = xatoi_u(timeout_arg); - } + opt_complementary = "t+"; /* -t N */ + getopt32(argv, "t:", &timeout); if (argv[optind]) { close(0); @@ -43,6 +41,7 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) dup(0); } + /* Malicious use like "sulogin /dev/sda"? */ if (!isatty(0) || !isatty(1) || !isatty(2)) { logmode = LOGMODE_SYSLOG; bb_error_msg_and_die("not a tty"); |