1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From 86d4d2ca2f1e873a29f9f4d4bba99fedee19a144 Mon Sep 17 00:00:00 2001
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Date: Thu, 29 Aug 2024 17:10:06 +0100
Subject: [PATCH 2/4] Fix unnecessary qualifications error
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Upstream-Status: Backport
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
src/front/domain_socket.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/front/domain_socket.rs b/src/front/domain_socket.rs
index 9fb8a0c..a0effa5 100644
--- a/src/front/domain_socket.rs
+++ b/src/front/domain_socket.rs
@@ -239,15 +239,16 @@ pub mod peer_credentials {
pub mod impl_linux {
use super::UCred;
use libc::{c_void, getsockopt, socklen_t, ucred, SOL_SOCKET, SO_PEERCRED};
+ use std::io;
+ use std::mem::size_of;
use std::os::unix::io::AsRawFd;
use std::os::unix::net::UnixStream;
- use std::{io, mem};
pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> {
- let ucred_size = mem::size_of::<ucred>();
+ let ucred_size = size_of::<ucred>();
// Trivial sanity checks.
- assert!(mem::size_of::<u32>() <= mem::size_of::<usize>());
+ assert!(size_of::<u32>() <= size_of::<usize>());
assert!(ucred_size <= u32::MAX as usize);
let mut ucred_size = ucred_size as socklen_t;
@@ -266,7 +267,7 @@ pub mod peer_credentials {
&mut ucred_size,
);
- if ret == 0 && ucred_size as usize == mem::size_of::<ucred>() {
+ if ret == 0 && ucred_size as usize == size_of::<ucred>() {
Ok(UCred {
uid: ucred.uid,
gid: ucred.gid,
--
2.43.0
|
