drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* passwd.c (usage): Rename DAYS to MINDAYS and MAXDAYS. 

* utils.xml (passwd): Ditto.
This commit is contained in:
Corinna Vinschen 2014-08-06 19:24:57 +00:00
parent 89d35a4833
commit 5528975705
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2014-08-06 Corinna Vinschen <corinna@vinschen.de>
* passwd.c (usage): Rename DAYS to MINDAYS and MAXDAYS.
* utils.xml (passwd): Ditto.
2014-07-29 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c (usage): Move info message that this /etc/group isn't really

11
winsup/utils/passwd.c
View File

@ -1,7 +1,7 @@
/* passwd.c: Changing passwords and managing account information
Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2008, 2009, 2011, 2012,
2013 Red Hat, Inc.
2013, 2014 Red Hat, Inc.
Written by Corinna Vinschen <corinna.vinschen@cityweb.de>
@ -168,9 +168,7 @@ ChangePW (const char *user, const char *oldpwd, const char *pwd, int justcheck,
if (justcheck && ret != ERROR_INVALID_PASSWORD)
return 0;
if (!EvalRet (ret, user) && !justcheck)
{
eprint (0, "Password changed.");
}
return ret;
}
@ -277,8 +275,8 @@ usage (FILE * stream, int status)
"System operations:\n"
" -i, --inactive NUM set NUM of days before inactive accounts are disabled\n"
" (inactive accounts are those with expired passwords).\n"
" -n, --minage DAYS set system minimum password age to DAYS days.\n"
" -x, --maxage DAYS set system maximum password age to DAYS days.\n"
" -n, --minage MINDAYS set system minimum password age to MINDAYS days.\n"
" -x, --maxage MAXDAYS set system maximum password age to MAXDAYS days.\n"
" -L, --length LEN set system minimum password length to LEN.\n"
"\n"
"Other options:\n"
@ -636,9 +634,6 @@ main (int argc, char **argv)
if (!caller_is_admin () && !myself)
return eprint (0, "You may not change the password for %s.", user);
eprint (0, "Enter the new password (minimum of 5, maximum of 8 characters).");
eprint (0, "Please use a combination of upper and lower case letters and numbers.");
oldpwd[0] = '\0';
if (!caller_is_admin ())
{

4
winsup/utils/utils.xml
View File

@ -1319,8 +1319,8 @@ User operations:
System operations:
-i, --inactive NUM set NUM of days before inactive accounts are disabled
(inactive accounts are those with expired passwords).
-n, --minage DAYS set system minimum password age to DAYS days.
-x, --maxage DAYS set system maximum password age to DAYS days.
-n, --minage MINDAYS set system minimum password age to MINDAYS days.
-x, --maxage MAXDAYS set system maximum password age to MAXDAYS days.
-L, --length LEN set system minimum password length to LEN.
Other options: