summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pw/pw_user.c
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-07-11 21:09:50 +0000
committerbapt <bapt@FreeBSD.org>2015-07-11 21:09:50 +0000
commit394857c344323f2f4f816462009badf094ce9b31 (patch)
tree7e85f4297e1c23fed136550b2dade767993f46f4 /usr.sbin/pw/pw_user.c
parent5e85f1c8a905c7049e28fad2721be1bdd20eca58 (diff)
downloadFreeBSD-src-394857c344323f2f4f816462009badf094ce9b31.zip
FreeBSD-src-394857c344323f2f4f816462009badf094ce9b31.tar.gz
check the gecos format early: at the moment the -c option is parsed
Diffstat (limited to 'usr.sbin/pw/pw_user.c')
-rw-r--r--usr.sbin/pw/pw_user.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 7e8534e..9e16793 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -650,10 +650,9 @@ pw_user(int mode, char *name, long id, struct cargs * args)
/*
* Shared add/edit code
*/
- if ((arg = getarg(args, 'c')) != NULL) {
- char *gecos = pw_checkname(arg->val, 1);
- if (strcmp(pwd->pw_gecos, gecos) != 0) {
- pwd->pw_gecos = gecos;
+ if (conf.gecos != NULL) {
+ if (strcmp(pwd->pw_gecos, conf.gecos) != 0) {
+ pwd->pw_gecos = conf.gecos;
edited = 1;
}
}
OpenPOWER on IntegriCloud