Merge Debian's patch 408_passwd_check_arguments

* NEWS, src/passwd.c: Make sure that no more than one username
	argument was provided.
This commit is contained in:
nekral-guest 2007-12-26 22:17:13 +00:00
parent b77cef01a9
commit f5461ff01e
3 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2007-12-26 Nicolas François <nicolas.francois@centraliens.net>
Merge Debian's patch 408_passwd_check_arguments
* NEWS, src/passwd.c: Make sure that no more than one username
argument was provided.
2007-12-26 Nicolas François <nicolas.francois@centraliens.net> 2007-12-26 Nicolas François <nicolas.francois@centraliens.net>
Merge Debian's patch 412_lastlog_-u_numerical_range Merge Debian's patch 412_lastlog_-u_numerical_range

2
NEWS
View File

@ -16,6 +16,8 @@ shadow-4.1.0 -> shadow-4.1.1 UNRELEASED
- lastlog - lastlog
* Accept users specified as a numerical UID, or ranges of users (-user, * Accept users specified as a numerical UID, or ranges of users (-user,
user-, user1-user2). user-, user1-user2).
- passwd
* Make sure that no more than one username argument was provided.
shadow-4.0.18.2 -> shadow-4.1.0 09-12-2008 shadow-4.0.18.2 -> shadow-4.1.0 09-12-2008

View File

@ -788,6 +788,12 @@ int main (int argc, char **argv)
else else
name = myname; name = myname;
/*
* Make sure that at most one username was specified.
*/
if (argc > optind+1)
usage (E_USAGE);
/* /*
* The -a flag requires -S, no other flags, no username, and * The -a flag requires -S, no other flags, no username, and
* you must be root. --marekm * you must be root. --marekm