Merge pull request #157 from himmelblau-idm/dmulder/libhimmelblau

Switch to using libhimmelblau
himmelblau-idm · Jul 15, 2024 · 4a9b860 · 4a9b860
2 parents a40e202 + 784d0a4
commit 4a9b860
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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 }

diff --git 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
@@ -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;