diff --git a/Cargo.toml b/Cargo.toml index 2a3ca79b..27520dd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,7 +83,7 @@ kanidm_lib_crypto = { path = "./src/crypto", version = "0.7.0" } kanidm_utils_users = { path = "./src/users" } walkdir = "2" csv = "1.2.2" -notify-debouncer-full = { version = "0.3" } +notify-debouncer-full = { version = "0.4" } utoipa = "4.0.0" utoipa-swagger-ui = "4.0.0" opentelemetry = { version = "0.20.0" } diff --git a/src/daemon/src/daemon.rs b/src/daemon/src/daemon.rs index 862ee3f7..e1977063 100644 --- a/src/daemon/src/daemon.rs +++ b/src/daemon/src/daemon.rs @@ -61,7 +61,7 @@ use tokio_util::codec::{Decoder, Encoder, Framed}; use kanidm_hsm_crypto::{soft::SoftTpm, AuthValue, BoxedDynTpm, Tpm}; -use notify_debouncer_full::{new_debouncer, notify::RecursiveMode, notify::Watcher}; +use notify_debouncer_full::{new_debouncer, notify::RecursiveMode}; mod broker; use broker::Broker; @@ -1051,10 +1051,10 @@ async fn main() -> ExitCode { let _ = inotify_tx.try_send(true); }) .and_then(|mut debouncer| { - debouncer.watcher().watch(Path::new("/etc/passwd"), RecursiveMode::NonRecursive) + debouncer.watch(Path::new("/etc/passwd"), RecursiveMode::NonRecursive) .map(|()| debouncer) }) - .and_then(|mut debouncer| debouncer.watcher().watch(Path::new("/etc/group"), RecursiveMode::NonRecursive) + .and_then(|mut debouncer| debouncer.watch(Path::new("/etc/group"), RecursiveMode::NonRecursive) .map(|()| debouncer) ) diff --git a/src/users/src/unix.rs b/src/users/src/unix.rs index 41dcdb8b..e064a871 100644 --- a/src/users/src/unix.rs +++ b/src/users/src/unix.rs @@ -31,9 +31,6 @@ pub fn get_user_name_by_uid(uid: uid_t) -> Option { let mut buf = vec![0; 2048]; let mut result = ptr::null_mut::(); - #[cfg(feature = "logging")] - trace!("Running getpwuid_r for user #{}", uid); - loop { let r = unsafe { libc::getpwuid_r(uid, &mut passwd, buf.as_mut_ptr(), buf.len(), &mut result) };