Merge branch 'rg/copy-gecos-username' into maint

* rg/copy-gecos-username: copy_gecos: fix not adding nlen to len when processing "&"
2011-05-26 09:37:04 -07:00 · 2011-05-26 09:37:04 -07:00 · 93446aa760
parent 9e0ec12728 c0336ff27a
commit 93446aa760
1 changed files with 1 additions and 0 deletions
--- a/ident.c
+++ b/ident.c
@ -34,6 +34,7 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz)
 			*dst++ = toupper(*w->pw_name);
 			memcpy(dst, w->pw_name + 1, nlen - 1);
 			dst += nlen - 1;
+			len += nlen;
 		}
 	}
 	if (len < sz)