d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partial revert of r286152

Browse Source 
More work needed on the cli validation
This commit is contained in:
bapt 2015-08-01 12:18:48 +00:00
parent 353f021396
commit 8fa8b523a2
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/pw/pw.c
View File

@ -262,11 +262,6 @@ main(int argc, char *argv[])
case 'c':
conf.gecos = pw_checkname(optarg, 1);
break;
case 'e':
conf.expire_days = strtonum(optarg, 0, INT_MAX, &errstr);
if (errstr)
errx(EX_USAGE, "Invalid expired days: %s", optarg);
break;
case 'g':
if (which == 0) { /* for user* */
addarg(&arglist, 'g', optarg);
@ -326,11 +321,6 @@ main(int argc, char *argv[])
case 'o':
conf.checkduplicate = false;
break;
case 'p':
conf.password_days = strtonum(optarg, 0, INT_MAX, &errstr);
if (errstr)
errx(EX_USAGE, "Invalid password days: %s", optarg);
break;
case 'q':
conf.quiet = true;
break;

2
usr.sbin/pw/pw_conf.c
View File

@ -367,6 +367,8 @@ read_userconfig(char const * file)
warnx("Invalid expire days:"
" '%s'; ignoring", q);
}
if ((q = unquote(q)) != NULL && isdigit(*q))
config.expire_days = atoi(q);
break;
case _UC_PASSWORD:
if ((q = unquote(q)) != NULL) {

8
usr.sbin/pw/pw_user.c
View File

@ -418,14 +418,14 @@ pw_user(int mode, char *name, long id, struct cargs * args)
errx(EX_OSFILE, "root home `%s' is not a directory", cnf->home);
}
if (conf.expire_days > 0)
cnf->expire_days = conf.expire_days;
if ((arg = getarg(args, 'e')) != NULL)
cnf->expire_days = atoi(arg->val);
if ((arg = getarg(args, 'y')) != NULL)
cnf->nispasswd = arg->val;
if (conf.password_days > 0)
cnf->password_days = conf.password_days;
if ((arg = getarg(args, 'p')) != NULL && arg->val)
cnf->password_days = atoi(arg->val);
if ((arg = getarg(args, 'g')) != NULL) {
if (!*(p = arg->val)) /* Handle empty group list specially */

2
usr.sbin/pw/pwupd.h
View File

@ -86,8 +86,6 @@ struct pwconf {
char *newname;
char *config;
char *gecos;
int expire_days;
int password_days;
int fd;
int rootfd;
int which;