always give 'interaction is required' once if a conversation error oc…

…curred (#2)
bjorn3 · Dec 19, 2024 · fd3cfec · fd3cfec
1 parent 169fe60
commit fd3cfec
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/sudo/pam.rs b/src/sudo/pam.rs
@@ -150,12 +150,15 @@ pub fn attempt_authenticate<C: Converser>(
             }
 
             // there was an authentication error, we can retry
-            Err(PamError::Pam(PamErrorType::AuthError | PamErrorType::ConversationError, _)) => {
+            Err(PamError::Pam(
+                err_type @ (PamErrorType::AuthError | PamErrorType::ConversationError),
+                _,
+            )) => {
                 max_tries -= 1;
-                if max_tries == 0 {
-                    return Err(Error::MaxAuthAttempts(current_try));
-                } else if non_interactive {
+                if non_interactive || err_type == PamErrorType::ConversationError {
                     return Err(Error::InteractionRequired);
+                } else if max_tries == 0 {
+                    return Err(Error::MaxAuthAttempts(current_try));
                 } else {
                     user_warn!("Authentication failed, try again.");
                 }