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

Finish converting -7 to pwconf

Browse Source
This commit is contained in:
Baptiste Daroussin 2015-06-07 15:54:57 +00:00
parent 33ff4adb05
commit 3438d7decf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=284126
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,8 +360,7 @@ pw_user(int mode, struct cargs * args)
if (mode == M_PRINT && getarg(args, 'F')) {
fakeuser.pw_name = a_name ? a_name->val : "nouser";
fakeuser.pw_uid = a_uid ? (uid_t) atol(a_uid->val) : (uid_t) -1;
return print_user(&fakeuser,
getarg(args, '7') != NULL);
return print_user(&fakeuser);
}
if (a_name == NULL)
errx(EX_NOUSER, "no such uid `%s'", a_uid->val);
@ -398,7 +397,7 @@ pw_user(int mode, struct cargs * args)
return (delete_user(cnf, pwd, a_name,
getarg(args, 'r') != NULL, mode));
else if (mode == M_PRINT)
return print_user(pwd, getarg(args, '7') != NULL);
return print_user(pwd);
/*
* The rest is edit code
@ -616,7 +615,7 @@ pw_user(int mode, struct cargs * args)
* Special case: -N only displays & exits
*/
if (conf.dryrun)
return print_user(pwd, getarg(args, '7') != NULL);
return print_user(pwd);
if (mode == M_ADD) {
edited = 1; /* Always */