From 3062d681f9052aabd4e02884e67a0fa1cf413f8b Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Sat, 12 Jun 2010 13:43:29 +0300
Subject: archive: honor username/groupname instead of uid/gid

Take the uid/gid from passwd and group.
---
 src/archive.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/archive.c')

diff --git a/src/archive.c b/src/archive.c
index e7260b6..f60cb1b 100644
--- a/src/archive.c
+++ b/src/archive.c
@@ -388,7 +388,10 @@ int apk_archive_entry_extract(int atfd, const struct apk_file_info *ae,
 		break;
 	}
 	if (r == 0) {
-		r = fchownat(atfd, fn, ae->uid, ae->gid, atflags);
+		r = fchownat(atfd, fn,
+			     apk_resolve_uid(ae->uname, ae->uid),
+			     apk_resolve_gid(ae->gname, ae->gid),
+			     atflags);
 		if (r < 0) {
 			apk_error("Failed to set ownership on %s: %s",
 				  fn, strerror(errno));
-- 
cgit v1.2.3-70-g09d2