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

* rg/copy-gecos-username:
  copy_gecos: fix not adding nlen to len when processing "&"

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)