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

check the gecos format early: at the moment the -c option is parsed

Browse Source
This commit is contained in:
Baptiste Daroussin 2015-07-11 21:09:50 +00:00
parent a8921b867f
commit 49c195e61e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,9 @@ main(int argc, char *argv[])
case 'a': case 'a':
conf.all = true; conf.all = true;
break; break;
case 'c':
conf.gecos = pw_checkname(optarg, 1);
break;
case 'g': case 'g':
if (which == 0) { /* for user* */ if (which == 0) { /* for user* */
addarg(&arglist, 'g', optarg); addarg(&arglist, 'g', optarg);

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

@ -650,10 +650,9 @@ pw_user(int mode, char *name, long id, struct cargs * args)
/* /*
* Shared add/edit code * Shared add/edit code
*/ */
if ((arg = getarg(args, 'c')) != NULL) { if (conf.gecos != NULL) {
char *gecos = pw_checkname(arg->val, 1); if (strcmp(pwd->pw_gecos, conf.gecos) != 0) {
if (strcmp(pwd->pw_gecos, gecos) != 0) { pwd->pw_gecos = conf.gecos;
pwd->pw_gecos = gecos;
edited = 1; edited = 1;
} }
} }

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

@ -85,6 +85,7 @@ struct pwconf {
char etcpath[MAXPATHLEN]; char etcpath[MAXPATHLEN];
char *newname; char *newname;
char *config; char *config;
char *gecos;
int fd; int fd;
int which; int which;
bool quiet; bool quiet;