Merge afe7c40911 into d6549077fb

Cargo.lock

@@ -3074,47 +3074,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "kanidm_unix_int"
-version = "1.6.0-dev"
-dependencies = [
- "async-trait",
- "bytes",
- "clap",
- "clap_complete",
- "dialoguer",
- "futures",
- "hashbrown 0.14.5",
- "kanidm-hsm-crypto",
- "kanidm_build_profiles",
- "kanidm_client",
- "kanidm_lib_crypto",
- "kanidm_lib_file_permissions",
- "kanidm_proto",
- "kanidm_unix_common",
- "kanidm_utils_users",
- "kanidmd_core",
- "kanidmd_testkit",
- "libc",
- "lru 0.12.5",
- "mimalloc",
- "notify-debouncer-full",
- "prctl",
- "rusqlite",
- "sd-notify",
- "selinux",
- "serde",
- "serde_json",
- "sketching",
- "time",
- "tokio",
- "tokio-util",
- "toml",
- "tracing",
- "uuid",
- "walkdir",
-]
-
 [[package]]
 name = "kanidm_utils_users"
 version = "1.6.0-dev"
@@ -3731,7 +3690,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "nss_kanidm"
+name = "nss_sparkle"
 version = "1.6.0-dev"
 dependencies = [
  "cc",
@@ -4128,7 +4087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
-name = "pam_kanidm"
+name = "pam_sparkle"
 version = "1.6.0-dev"
 dependencies = [
  "kanidm_unix_common",
@@ -5291,6 +5250,47 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "sparkle_unix_int"
+version = "1.6.0-dev"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "clap",
+ "clap_complete",
+ "dialoguer",
+ "futures",
+ "hashbrown 0.14.5",
+ "kanidm-hsm-crypto",
+ "kanidm_build_profiles",
+ "kanidm_client",
+ "kanidm_lib_crypto",
+ "kanidm_lib_file_permissions",
+ "kanidm_proto",
+ "kanidm_unix_common",
+ "kanidm_utils_users",
+ "kanidmd_core",
+ "kanidmd_testkit",
+ "libc",
+ "lru 0.12.5",
+ "mimalloc",
+ "notify-debouncer-full",
+ "prctl",
+ "rusqlite",
+ "sd-notify",
+ "selinux",
+ "serde",
+ "serde_json",
+ "sketching",
+ "time",
+ "tokio",
+ "tokio-util",
+ "toml",
+ "tracing",
+ "uuid",
+ "walkdir",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.8"

Cargo.toml

@@ -20,8 +20,8 @@ members = [
     "tools/iam_migrations/ldap",
     "tools/orca",
     "unix_integration/common",
-    "unix_integration/nss_kanidm",
-    "unix_integration/pam_kanidm",
+    "unix_integration/nss",
+    "unix_integration/pam",
     "unix_integration/resolver",
     "server/daemon",
     "server/lib",

unix_integration/nss/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "nss_kanidm"
-description = "Kanidm NSS module"
+name = "nss_sparkle"
+description = "Sparkling Identity Provider - NSS module"
 
 version = { workspace = true }
 authors = { workspace = true }
@@ -11,7 +11,7 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [lib]
-name = "nss_kanidm"
+name = "nss_sparkle"
 crate-type = ["cdylib"]
 path = "src/lib.rs"
 
@@ -31,6 +31,8 @@ cc = "^1.2.10"
 # A target specific variant must be used to get the right multiarch path.
 [package.metadata.deb]
 name = "libnss-kanidm"
+# name = "libnss-sparkle"
+# replaces = "libnss-kanidm"
 maintainer = "James Hodgkinson <james@terminaloutcomes.com>"
 depends = ""
 section = "network"
@@ -42,7 +44,12 @@ assets = [
 [package.metadata.deb.variants.aarch64-unknown-linux-gnu]
 merge-assets.append = [
     [
-        "target/release/libnss_kanidm.so",
+        "target/release/libnss_sparkle.so",
+        "usr/lib/aarch64-linux-gnu/libnss_sparkle.so.2",
+        "644",
+    ],
+    [
+        "target/release/libnss_sparkle.so",
         "usr/lib/aarch64-linux-gnu/libnss_kanidm.so.2",
         "644",
     ],
@@ -50,6 +57,11 @@ merge-assets.append = [
 
 [package.metadata.deb.variants.x86_64-unknown-linux-gnu]
 merge-assets.append = [
+    [
+        "target/release/libnss_sparkle.so",
+        "usr/lib/x86_64-linux-gnu/libnss_sparkle.so.2",
+        "644",
+    ],
     [
         "target/release/libnss_kanidm.so",
         "usr/lib/x86_64-linux-gnu/libnss_kanidm.so.2",

unix_integration/pam/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "pam_kanidm"
-description = "Kanidm PAM module"
+name = "pam_sparkle"
+description = "Sparkling Authentication Provider - PAM module"
 links = "pam"
 
 version = { workspace = true }
@@ -12,7 +12,7 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [lib]
-name = "pam_kanidm"
+name = "pam_sparkle"
 crate-type = ["cdylib"]
 path = "src/lib.rs"
 
@@ -31,6 +31,8 @@ pkg-config = { workspace = true }
 # A target specific variant must be used to get the right multiarch path.
 [package.metadata.deb]
 name = "libpam-kanidm"
+# name = "libpam-sparkle"
+# replaces = "libpam-kanidm"
 maintainer = "James Hodgkinson <james@terminaloutcomes.com>"
 depends = ["libc6", "libpam0g"]
 section = "network"
@@ -43,7 +45,12 @@ assets = [
 [package.metadata.deb.variants.aarch64-unknown-linux-gnu]
 merge-assets.append = [
     [
-        "target/release/libpam_kanidm.so",
+        "target/release/libpam_sparkle.so",
+        "usr/lib/aarch64-linux-gnu/security/pam_sparkle.so",
+        "644",
+    ],
+    [
+        "target/release/libpam_sparkle.so",
         "usr/lib/aarch64-linux-gnu/security/pam_kanidm.so",
         "644",
     ],
@@ -56,6 +63,11 @@ merge-assets.append = [
 
 [package.metadata.deb.variants.x86_64-unknown-linux-gnu]
 merge-assets.append = [
+    [
+        "target/release/libpam_sparkle.so",
+        "usr/lib/x86_64-linux-gnu/security/pam_sparkle.so",
+        "644",
+    ],
     [
         "target/release/libpam_kanidm.so",
         "usr/lib/x86_64-linux-gnu/security/pam_kanidm.so",

unix_integration/resolver/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "kanidm_unix_int"
+name = "sparkle_unix_int"
 description = "Kanidm Unix Integration Clients"
 documentation = "https://docs.rs/kanidm/latest/kanidm/"
 
@@ -18,14 +18,14 @@ selinux = ["dep:selinux"]
 tpm = ["kanidm-hsm-crypto/tpm"]
 
 [[bin]]
-name = "kanidm_unixd"
+name = "sparkle_unixd"
 path = "src/bin/kanidm_unixd.rs"
 required-features = ["unix"]
 test = false
 doctest = false
 
 [[bin]]
-name = "kanidm_unixd_tasks"
+name = "sparkle_unixd_tasks"
 path = "src/bin/kanidm_unixd_tasks.rs"
 required-features = ["unix"]
 test = false
@@ -125,9 +125,9 @@ priority = "optional"
 changelog = "../../target/debian/changelog"  # Generated by platform/debian/build_debs.sh
 assets = [
     [ "target/release/kanidm_ssh_authorizedkeys", "usr/sbin/", "755" ],
-    [ "target/release/kanidm_unixd_tasks", "usr/sbin/", "755" ],
-    [ "target/release/kanidm_unixd", "usr/sbin/", "755" ],
     [ "target/release/kanidm-unix", "usr/sbin/", "755" ],
+    [ "target/release/sparkle_unixd_tasks", "usr/sbin/", "755" ],
+    [ "target/release/sparkle_unixd", "usr/sbin/", "755" ],
     [ "../../examples/unixd-safe-default", "etc/kanidm/unixd", "644" ],
     [ "../../examples/kanidm-safe-default", "etc/kanidm/config", "644" ],
     [ "../../examples/kanidm", "usr/share/kanidm-unixd/", "444" ],

unix_integration/resolver/debian/kanidm_unix_int.kanidm-unixd-tasks.service

@@ -8,7 +8,7 @@ After=chronyd.service ntpd.service network-online.target kanidm-unixd.service
 [Service]
 User=root
 Type=notify
-ExecStart=/usr/sbin/kanidm_unixd_tasks
+ExecStart=/usr/sbin/sparkle_unixd_tasks
 
 # because kanidm-unixd might have failed for some reason but we need to try again later
 Restart=always

unix_integration/resolver/debian/kanidm_unix_int.kanidm-unixd.service

@@ -20,7 +20,7 @@ StateDirectory=kanidm-unixd
 
 
 Type=notify
-ExecStart=/usr/sbin/kanidm_unixd
+ExecStart=/usr/sbin/sparkle_unixd
 # auth going down is bad, but infinite speedlooping is worse
 Restart=always
 RestartSec=30