bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add pid as an option to UCred struct

Browse source 
Currently, PID will be populated for Linux, and set to None for BSDs.
This commit is contained in:
Joe Ellis 2020-09-08 09:41:23 +01:00
parent cbcf3877b5
commit 40a830321d
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/std/src/sys/unix/ext/ucred.rs
View file

@ -6,7 +6,7 @@
// For reference, the link is here: https://github.com/tokio-rs/tokio-uds/pull/13 // For reference, the link is here: https://github.com/tokio-rs/tokio-uds/pull/13
// Credit to Martin Habovštiak (GitHub username Kixunil) and contributors for this work. // Credit to Martin Habovštiak (GitHub username Kixunil) and contributors for this work.
use libc::{gid_t, uid_t}; use libc::{gid_t, pid_t, uid_t};
/// Credentials for a UNIX process for credentials passing. /// Credentials for a UNIX process for credentials passing.
#[unstable(feature = "peer_credentials_unix_socket", issue = "42839", reason = "unstable")] #[unstable(feature = "peer_credentials_unix_socket", issue = "42839", reason = "unstable")]
@ -14,6 +14,8 @@ use libc::{gid_t, uid_t};
pub struct UCred { pub struct UCred {
pub uid: uid_t, pub uid: uid_t,
pub gid: gid_t, pub gid: gid_t,
// pid field is an option because it is not supported on some platforms.
pub pid: Option<pid_t>,
} }
#[cfg(any(target_os = "android", target_os = "linux"))] #[cfg(any(target_os = "android", target_os = "linux"))]
@ -57,7 +59,7 @@ pub mod impl_linux {
); );
if ret == 0 && ucred_size as usize == mem::size_of::<ucred>() { if ret == 0 && ucred_size as usize == mem::size_of::<ucred>() {
Ok(UCred { uid: ucred.uid, gid: ucred.gid }) Ok(UCred { uid: ucred.uid, gid: ucred.gid, pid: Some(ucred.pid) })
} else { } else {
Err(io::Error::last_os_error()) Err(io::Error::last_os_error())
} }
@ -79,7 +81,7 @@ pub mod impl_bsd {
use crate::os::unix::net::UnixStream; use crate::os::unix::net::UnixStream;
pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> { pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> {
let mut cred = UCred { uid: 1, gid: 1 }; let mut cred = UCred { uid: 1, gid: 1, pid: None };
unsafe { unsafe {
let ret = libc::getpeereid(socket.as_raw_fd(), &mut cred.uid, &mut cred.gid); let ret = libc::getpeereid(socket.as_raw_fd(), &mut cred.uid, &mut cred.gid);