diff --git a/book/src/integrations/pam_and_nsswitch/suse.md b/book/src/integrations/pam_and_nsswitch/suse.md index e44817129..3137aed00 100644 --- a/book/src/integrations/pam_and_nsswitch/suse.md +++ b/book/src/integrations/pam_and_nsswitch/suse.md @@ -38,14 +38,12 @@ The content should look like: # /etc/pam.d/common-account # Controls authorisation to this system (who may login) account sufficient pam_kanidm.so ignore_unknown_user -account sufficient pam_unix.so account required pam_deny.so # /etc/pam.d/common-auth # Controls authentication to this system (verification of credentials) auth required pam_env.so auth sufficient pam_kanidm.so ignore_unknown_user -auth sufficient pam_unix.so try_first_pass auth required pam_deny.so # /etc/pam.d/common-password @@ -60,7 +58,6 @@ session optional pam_systemd.so session required pam_limits.so session optional pam_umask.so session optional pam_kanidm.so -session optional pam_unix.so try_first_pass session optional pam_env.so ``` diff --git a/unix_integration/resolver/src/resolver.rs b/unix_integration/resolver/src/resolver.rs index bd0908129..8204ca062 100644 --- a/unix_integration/resolver/src/resolver.rs +++ b/unix_integration/resolver/src/resolver.rs @@ -165,17 +165,17 @@ impl Resolver { #[instrument(level = "debug", skip_all)] pub async fn clear_cache(&self) -> Result<(), ()> { + let mut dbtxn = self.db.write().await; let mut nxcache_txn = self.nxcache.lock().await; nxcache_txn.clear(); - let mut dbtxn = self.db.write().await; dbtxn.clear().and_then(|_| dbtxn.commit()).map_err(|_| ()) } #[instrument(level = "debug", skip_all)] pub async fn invalidate(&self) -> Result<(), ()> { + let mut dbtxn = self.db.write().await; let mut nxcache_txn = self.nxcache.lock().await; nxcache_txn.clear(); - let mut dbtxn = self.db.write().await; dbtxn .invalidate() .and_then(|_| dbtxn.commit())