From: Karel Zak <kzak@redhat.com>
Date: Mon, 19 Aug 2019 12:03:07 +0000 (+0200)
Subject: chfn: don't append extra tailing commas
X-Git-Tag: v2.35-rc1~283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9210c0d225fd808da451d86055bf243a8b47a525;p=thirdparty%2Futil-linux.git

chfn: don't append extra tailing commas

 # grep kzak /etc/passwd
 kzak:x:1000:1000::/home/kzak:/bin/bash

 # chfn kzak
 ...
 grep kzak /etc/passwd

old version:
 kzak:x:1000:1000:Karel Zak,,,,:/home/kzak:/bin/bash

fixed version:
 kzak:x:1000:1000:Karel Zak:/home/kzak:/bin/bash

Reported-by: Filip Dvorak <fdvorak@redhat.com>
References: f723cbf544a7eac2927634f2cb6d802437a2d519
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index a2e6e099e0..b7395552bb 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -376,7 +376,7 @@ static int save_new_data(struct chfn_control *ctl)
 			ctl->newf.other);
 
 	/* remove trailing empty fields (but not subfields of ctl->newf.other) */
-	if (!ctl->newf.other) {
+	if (!ctl->newf.other || !*ctl->newf.other) {
 		while (len > 0 && gecos[len - 1] == ',')
 			len--;
 		gecos[len] = 0;