From 32eeaeae8e88639b4402485fc85046501d65ca62 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Tue, 3 Sep 2024 14:09:50 -0600 Subject: [PATCH] Fix CI failures caused by cargo 1.80.1 Signed-off-by: David Mulder --- .gitmodules | 4 ++-- src/common/Cargo.toml | 3 +++ src/daemon/src/tasks_daemon.rs | 1 + src/kanidm | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d58dbbf5..70291ff3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "src/kanidm"] path = src/kanidm - url = https://github.com/kanidm/kanidm.git - branch = master + url = https://github.com/dmulder/kanidm.git + branch = himmelblau/main shallow = true [submodule "src/idmap/sssd"] path = src/idmap/sssd diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 8a2141c7..9065f82a 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -9,6 +9,9 @@ license.workspace = true homepage.workspace = true repository.workspace = true +[features] +tpm = ["kanidm-hsm-crypto/tpm"] + [lib] name = "himmelblau_unix_common" path = "src/lib.rs" diff --git a/src/daemon/src/tasks_daemon.rs b/src/daemon/src/tasks_daemon.rs index 3645710d..602fef6f 100644 --- a/src/daemon/src/tasks_daemon.rs +++ b/src/daemon/src/tasks_daemon.rs @@ -9,6 +9,7 @@ #![deny(clippy::await_holding_lock)] #![deny(clippy::needless_pass_by_value)] #![deny(clippy::trivially_copy_pass_by_ref)] +#![allow(unexpected_cfgs)] use std::ffi::CString; use std::os::unix::ffi::OsStrExt; diff --git a/src/kanidm b/src/kanidm index ac9a90ab..2ee1c6cb 160000 --- a/src/kanidm +++ b/src/kanidm @@ -1 +1 @@ -Subproject commit ac9a90abf3a798a60dc09e326d0afecf4e95d6c8 +Subproject commit 2ee1c6cbd2b21af96a7f65a4b385fc7e6c54729a