privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

fixup! packages/kanidm: update unixd-authenticated.patch

Browse source
This commit is contained in:
Max Headroom 2024-11-09 00:41:02 +01:00
parent ad7de0d455
commit 726491e780
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
patches/base/kanidm/unixd-authenticated.patch
View file

@ -1,5 +1,5 @@
diff --git a/unix_integration/resolver/src/idprovider/kanidm.rs b/unix_integration/resolver/src/idprovider/kanidm.rs diff --git a/unix_integration/resolver/src/idprovider/kanidm.rs b/unix_integration/resolver/src/idprovider/kanidm.rs
index 63cedb4d5..4fff49f73 100644 index 63cedb4d5..35c45fb0e 100644
--- a/unix_integration/resolver/src/idprovider/kanidm.rs --- a/unix_integration/resolver/src/idprovider/kanidm.rs
+++ b/unix_integration/resolver/src/idprovider/kanidm.rs +++ b/unix_integration/resolver/src/idprovider/kanidm.rs
@@ -7,6 +7,7 @@ use kanidm_proto::internal::OperationError; @@ -7,6 +7,7 @@ use kanidm_proto::internal::OperationError;
@ -43,8 +43,8 @@ index 63cedb4d5..4fff49f73 100644
hmac_key, hmac_key,
crypto_policy, crypto_policy,
pam_allow_groups, pam_allow_groups,
+ env_username, + auth_name: env_username,
+ env_password + auth_password: env_password
}), }),
map_group, map_group,
}) })
@ -54,8 +54,8 @@ index 63cedb4d5..4fff49f73 100644
async fn attempt_online(&mut self, _tpm: &mut tpm::BoxedDynTpm, now: SystemTime) -> bool { async fn attempt_online(&mut self, _tpm: &mut tpm::BoxedDynTpm, now: SystemTime) -> bool {
- match self.client.auth_anonymous().await { - match self.client.auth_anonymous().await {
+ let auth_method = match (&self.auth_name, &self.auth_password) { + let auth_method = match (&self.auth_name, &self.auth_password) {
+ (Some(name), Some(password)) => self.client.write().await.auth_simple_password(name, password).await, + (Some(name), Some(password)) => self.client.auth_simple_password(name, password).await,
+ _ => self.client.write().await.auth_anonymous().await + _ => self.client.auth_anonymous().await
+ }; + };
+ match auth_method { + match auth_method {
Ok(_uat) => { Ok(_uat) => {