From: Martin Matuška <martin@matuska.de>
Date: Thu, 25 Dec 2025 09:04:44 +0000 (+0100)
Subject: Merge pull request #2814 from AZero13/gname
X-Git-Tag: v3.8.5~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d0d2311d318f8cdbd638e43456fa333f5804ac5;p=thirdparty%2Flibarchive.git

Merge pull request #2814 from AZero13/gname

uname_override checks gname_override when it should check uname_override

(cherry picked from commit 5c84afd66448810d7df1c19dac6cad3b8a36a463)
---

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 262db5105..77eefe809 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -725,7 +725,7 @@ file_to_archive(struct cpio *cpio, const char *srcpath)
 
 	if (cpio->uid_override >= 0)
 		archive_entry_set_uid(entry, cpio->uid_override);
-	if (cpio->gname_override != NULL)
+	if (cpio->uname_override != NULL)
 		archive_entry_set_uname(entry, cpio->uname_override);
 	if (cpio->gid_override >= 0)
 		archive_entry_set_gid(entry, cpio->gid_override);