mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Update docs, improve locking (#3141)

Browse source
This commit is contained in:
Firstyear 2024-10-25 09:42:52 +10:00 committed by GitHub
parent 120f990ce1
commit 4c2eeeb135
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
book/src/integrations/pam_and_nsswitch/suse.md
View file

@ -38,14 +38,12 @@ The content should look like:
# /etc/pam.d/common-account # /etc/pam.d/common-account
# Controls authorisation to this system (who may login) # Controls authorisation to this system (who may login)
account sufficient pam_kanidm.so ignore_unknown_user account sufficient pam_kanidm.so ignore_unknown_user
account sufficient pam_unix.so
account required pam_deny.so account required pam_deny.so
# /etc/pam.d/common-auth # /etc/pam.d/common-auth
# Controls authentication to this system (verification of credentials) # Controls authentication to this system (verification of credentials)
auth required pam_env.so auth required pam_env.so
auth sufficient pam_kanidm.so ignore_unknown_user auth sufficient pam_kanidm.so ignore_unknown_user
auth sufficient pam_unix.so try_first_pass
auth required pam_deny.so auth required pam_deny.so
# /etc/pam.d/common-password # /etc/pam.d/common-password
@ -60,7 +58,6 @@ session optional pam_systemd.so
session required pam_limits.so session required pam_limits.so
session optional pam_umask.so session optional pam_umask.so
session optional pam_kanidm.so session optional pam_kanidm.so
session optional pam_unix.so try_first_pass
session optional pam_env.so session optional pam_env.so
``` ```

4
unix_integration/resolver/src/resolver.rs
View file

@ -165,17 +165,17 @@ impl Resolver {
#[instrument(level = "debug", skip_all)] #[instrument(level = "debug", skip_all)]
pub async fn clear_cache(&self) -> Result<(), ()> { pub async fn clear_cache(&self) -> Result<(), ()> {
let mut dbtxn = self.db.write().await;
let mut nxcache_txn = self.nxcache.lock().await; let mut nxcache_txn = self.nxcache.lock().await;
nxcache_txn.clear(); nxcache_txn.clear();
let mut dbtxn = self.db.write().await;
dbtxn.clear().and_then(|_| dbtxn.commit()).map_err(|_| ()) dbtxn.clear().and_then(|_| dbtxn.commit()).map_err(|_| ())
} }
#[instrument(level = "debug", skip_all)] #[instrument(level = "debug", skip_all)]
pub async fn invalidate(&self) -> Result<(), ()> { pub async fn invalidate(&self) -> Result<(), ()> {
let mut dbtxn = self.db.write().await;
let mut nxcache_txn = self.nxcache.lock().await; let mut nxcache_txn = self.nxcache.lock().await;
nxcache_txn.clear(); nxcache_txn.clear();
let mut dbtxn = self.db.write().await;
dbtxn dbtxn
.invalidate() .invalidate()
.and_then(|_| dbtxn.commit()) .and_then(|_| dbtxn.commit())