From ead7546a96674c44d83b045658f01253e06bc50d Mon Sep 17 00:00:00 2001
From: Christian Ebner <c.ebner@proxmox.com>
Date: Fri, 2 Aug 2019 15:19:35 +0200
Subject: [PATCH] pxar: change uid and gid to u32 instead of u64

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 src/pxar/encoder.rs            | 4 ++--
 src/pxar/format_definition.rs  | 4 ++--
 src/pxar/sequential_decoder.rs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pxar/encoder.rs b/src/pxar/encoder.rs
index 6271b8b1..77f0625b 100644
--- a/src/pxar/encoder.rs
+++ b/src/pxar/encoder.rs
@@ -198,8 +198,8 @@ impl <'a, W: Write> Encoder<'a, W> {
         let entry = PxarEntry {
             mode: mode,
             flags: 0,
-            uid: stat.st_uid as u64,
-            gid: stat.st_gid as u64,
+            uid: stat.st_uid,
+            gid: stat.st_gid,
             mtime: mtime as u64,
         };
 
diff --git a/src/pxar/format_definition.rs b/src/pxar/format_definition.rs
index 7030b58f..7a40d1ec 100644
--- a/src/pxar/format_definition.rs
+++ b/src/pxar/format_definition.rs
@@ -51,8 +51,8 @@ pub struct PxarHeader {
 pub struct PxarEntry {
     pub mode: u64,
     pub flags: u64,
-    pub uid: u64,
-    pub gid: u64,
+    pub uid: u32,
+    pub gid: u32,
     pub mtime: u64,
 }
 
diff --git a/src/pxar/sequential_decoder.rs b/src/pxar/sequential_decoder.rs
index 2c4bfdd2..49c867fd 100644
--- a/src/pxar/sequential_decoder.rs
+++ b/src/pxar/sequential_decoder.rs
@@ -378,8 +378,8 @@ impl <'a, R: Read, F: Fn(&Path) -> Result<(), Error>> SequentialDecoder<'a, R, F
 
     fn restore_ugid(&mut self, entry: &PxarEntry, fd: RawFd) -> Result<(), Error> {
 
-        let uid = entry.uid as u32;
-        let gid = entry.gid as u32;
+        let uid = entry.uid;
+        let gid = entry.gid;
 
         let res = unsafe { libc::fchown(fd, uid, gid) };
         Errno::result(res)?;