From 68ff495afa7687677cf9facf83c5130db24d3acd Mon Sep 17 00:00:00 2001
From: Joe Ellis <joe.ellis@arm.com>
Date: Thu, 10 Sep 2020 09:11:49 +0100
Subject: [PATCH] Fix peer credentials for Android

---
 library/std/src/sys/unix/ext/ucred.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/std/src/sys/unix/ext/ucred.rs b/library/std/src/sys/unix/ext/ucred.rs
index 97f10e52b066c..ed7516c7f28f8 100644
--- a/library/std/src/sys/unix/ext/ucred.rs
+++ b/library/std/src/sys/unix/ext/ucred.rs
@@ -43,24 +43,23 @@ pub mod impl_linux {
     use crate::os::unix::io::AsRawFd;
     use crate::os::unix::net::UnixStream;
     use crate::{io, mem};
+    use libc::{c_void, getsockopt, socklen_t, ucred, SOL_SOCKET, SO_PEERCRED};
 
     pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> {
-        use libc::{c_void, ucred};
-
         let ucred_size = mem::size_of::<ucred>();
 
         // Trivial sanity checks.
         assert!(mem::size_of::<u32>() <= mem::size_of::<usize>());
         assert!(ucred_size <= u32::MAX as usize);
 
-        let mut ucred_size = ucred_size as u32;
+        let mut ucred_size = ucred_size as socklen_t;
         let mut ucred: ucred = ucred { pid: 1, uid: 1, gid: 1 };
 
         unsafe {
-            let ret = libc::getsockopt(
+            let ret = getsockopt(
                 socket.as_raw_fd(),
-                libc::SOL_SOCKET,
-                libc::SO_PEERCRED,
+                SOL_SOCKET,
+                SO_PEERCRED,
                 &mut ucred as *mut ucred as *mut c_void,
                 &mut ucred_size,
             );