Fix issues with suspend reported by himmelblau (#2911)

Cargo.lock

@@ -592,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a56894edf5cd1efa7068d7454adeb7ce0b3da4ffa5ab08cfc06165bbc62f0c7"
 dependencies = [
  "base64 0.21.7",
- "paste 1.0.15",
+ "paste",
  "serde",
 ]
 
@@ -3791,13 +3791,13 @@ dependencies = [
 
 [[package]]
 name = "libnss"
-version = "0.4.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c"
+checksum = "3c4bc0291fc787d67c56e9ed79b80780e53bfb9be173177f301ee666cec1021b"
 dependencies = [
  "lazy_static",
  "libc",
- "paste 0.1.18",
+ "paste",
 ]
 
 [[package]]
@@ -4102,7 +4102,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "libnss",
- "paste 1.0.15",
+ "paste",
 ]
 
 [[package]]
@@ -4579,31 +4579,12 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "paste"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "paste-impl"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
-dependencies = [
- "proc-macro-hack",
-]
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -4879,12 +4860,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
@@ -6358,7 +6333,7 @@ dependencies = [
  "num-derive",
  "num-traits",
  "oid",
- "paste 1.0.15",
+ "paste",
  "picky-asn1",
  "picky-asn1-x509",
  "regex",

Cargo.toml

@@ -207,7 +207,7 @@ ldap3_client = "^0.5"
 ldap3_proto = { version = "^0.5", features = ["serde"] }
 
 libc = "^0.2.153"
-libnss = "^0.4.0"
+libnss = "^0.8.0"
 libsqlite3-sys = "^0.25.2"
 lodepng = "3.10.2"
 lru = "^0.12.3"

platform/opensuse/kanidm-unixd-tasks.service

@@ -3,7 +3,7 @@
 
 [Unit]
 Description=Kanidm Local Tasks
-After=chronyd.service ntpd.service network-online.target kanidm-unixd.service
+After=chronyd.service ntpd.service network-online.target suspend.target kanidm-unixd.service
 Requires=kanidm-unixd.service
 
 [Service]

platform/opensuse/kanidm-unixd.service

@@ -3,7 +3,7 @@
 
 [Unit]
 Description=Kanidm Local Client Resolver
-After=chronyd.service nscd.service ntpd.service network-online.target
+After=chronyd.service nscd.service ntpd.service network-online.target suspend.target
 Before=systemd-user-sessions.service sshd.service nss-user-lookup.target
 Wants=nss-user-lookup.target
 # While it seems confusing, we need to be after nscd.service so that the

server/core/src/https/mod.rs

@@ -312,7 +312,6 @@ pub async fn create_https_server(
                 Router::new().nest_service("/pkg", ServeDir::new(pkg_path))
                 // TODO: Add in the br precompress
             } else {
-
                 let pkg_path = PathBuf::from(env!("KANIDM_WEB_UI_PKG_PATH"));
                 if !pkg_path.exists() {
                     eprintln!(

unix_integration/nss_kanidm/src/lib.rs

@@ -13,9 +13,6 @@
 #[cfg(target_family = "unix")]
 #[macro_use]
 extern crate libnss;
-#[cfg(target_family = "unix")]
-#[macro_use]
-extern crate lazy_static;
 
 #[cfg(target_family = "unix")]
 mod implementation;