]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge pull request #2814 from AZero13/gname
authorMartin Matuška <martin@matuska.de>
Thu, 25 Dec 2025 09:04:44 +0000 (10:04 +0100)
committerMartin Matuska <martin@matuska.de>
Thu, 25 Dec 2025 09:21:17 +0000 (10:21 +0100)
uname_override checks gname_override when it should check uname_override

(cherry picked from commit 5c84afd66448810d7df1c19dac6cad3b8a36a463)

cpio/cpio.c

index 262db510568b8dc368254d5bee3888b9f8e81d0e..77eefe809f3759436078c39d0aa470a5d07f3adb 100644 (file)
@@ -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);