From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 12 Oct 2016 18:56:46 +0000 (+0200)
Subject: cpio: fix restoration of file ownership, closes 9306
X-Git-Tag: 1_26_0~151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=85100a7067a51c5e6720c0a738317cc2144ab219;p=oweals%2Fbusybox.git

cpio: fix restoration of file ownership, closes 9306

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/libarchive/init_handle.c b/archival/libarchive/init_handle.c
index cbae06ac3..dcba6666f 100644
--- a/archival/libarchive/init_handle.c
+++ b/archival/libarchive/init_handle.c
@@ -17,6 +17,10 @@ archive_handle_t* FAST_FUNC init_handle(void)
 	archive_handle->action_data = data_skip;
 	archive_handle->filter = filter_accept_all;
 	archive_handle->seek = seek_by_jump;
+#if ENABLE_CPIO || ENABLE_RPM2CPIO || ENABLE_RPM
+	archive_handle->cpio__owner.uid = (uid_t)-1L;
+	archive_handle->cpio__owner.gid = (gid_t)-1L;
+#endif
 
 	return archive_handle;
 }