From d55dc88ad44f4c9af875d561722867f3c02aeae2 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Fri, 12 Jul 2024 09:53:50 -0600 Subject: [PATCH 1/2] Switch to using libhimmelblau This is just the new name for the msal library. Signed-off-by: David Mulder --- Cargo.toml | 2 +- src/common/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 21f55a0..1b0b649 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ tracing-subscriber = "^0.3.17" tracing = "^0.1.37" himmelblau_unix_common = { path = "src/common" } kanidm_unix_common = { path = "src/glue" } -msal = { version = "0.2.6" } +libhimmelblau = { version = "0.2.6" } clap = { version = "^4.5", features = ["derive", "env"] } clap_complete = "^4.4.1" reqwest = { version = "^0.12.2", features = ["json"] } diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 55fbe0a..8a2141c 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -19,7 +19,7 @@ serde_derive = "^1.0.164" serde_json = { workspace = true } tracing = { workspace = true } configparser = "^3.0.2" -msal = { workspace = true } +libhimmelblau = { workspace = true } reqwest = { workspace = true } pem = { workspace = true } kanidm-hsm-crypto = { workspace = true } From 784d0a46c59e823d3236333a10922a989ba43158 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Mon, 15 Jul 2024 08:46:29 -0600 Subject: [PATCH 2/2] update libnss requirement from 0.7.0 to 0.8.0 Signed-off-by: David Mulder --- src/nss/Cargo.toml | 2 +- src/nss/src/lib.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/nss/Cargo.toml b/src/nss/Cargo.toml index 0c94583..9d65c49 100644 --- a/src/nss/Cargo.toml +++ b/src/nss/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] himmelblau_unix_common = { workspace = true } kanidm_unix_common = { workspace = true } -libnss = "0.7.0" +libnss = "0.8.0" libc = { workspace = true } paste = { workspace = true } lazy_static = { workspace = true } diff --git a/src/nss/src/lib.rs b/src/nss/src/lib.rs index 4d1cdbb..4831c0d 100644 --- a/src/nss/src/lib.rs +++ b/src/nss/src/lib.rs @@ -14,8 +14,6 @@ #[macro_use] extern crate libnss; #[cfg(target_family = "unix")] -#[macro_use] -extern crate lazy_static; #[cfg(target_family = "unix")] mod implementation;