From dbcdc7619731bcd5da2d98cef8efbeffd46205ff Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 11 Jun 2025 15:59:09 +0200 Subject: [PATCH] pbs-config: update to nix 0.29 Signed-off-by: Wolfgang Bumiller Signed-off-by: Thomas Lamprecht --- pbs-config/src/network/helper.rs | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pbs-config/src/network/helper.rs b/pbs-config/src/network/helper.rs index 87a0e24f..e0b07a01 100644 --- a/pbs-config/src/network/helper.rs +++ b/pbs-config/src/network/helper.rs @@ -1,5 +1,5 @@ use std::collections::HashMap; -use std::os::unix::io::{AsRawFd, FromRawFd, OwnedFd}; +use std::os::unix::io::AsRawFd; use std::path::Path; use std::process::Command; use std::sync::LazyLock; @@ -137,24 +137,20 @@ pub fn get_network_interfaces() -> Result, Error> { let lines = raw.lines(); - let sock = unsafe { - OwnedFd::from_raw_fd( - socket( - AddressFamily::Inet, - SockType::Datagram, - SockFlag::empty(), - None, - ) - .or_else(|_| { - socket( - AddressFamily::Inet6, - SockType::Datagram, - SockFlag::empty(), - None, - ) - })?, + let sock = socket( + AddressFamily::Inet, + SockType::Datagram, + SockFlag::empty(), + None, + ) + .or_else(|_| { + socket( + AddressFamily::Inet6, + SockType::Datagram, + SockFlag::empty(), + None, ) - }; + })?; let mut interface_list = HashMap::new();