Match password prompts from new OpenSSH

* lisp/comint.el (comint-password-prompt-regexp): Add support for
the openssh-8.6p1 "(user@host) Password:" format (bug#51666).

diff --git a/lisp/comint.el b/lisp/comint.el
index c114bdf758a75b12413bba09757d3bec07b7634f..adae971eff20fe622578ac95b134567487c614e3 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -385,10 +385,12 @@ This variable is buffer-local."
    "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:space:]]*\\'"
    ;; The ccrypt encryption dialogue doesn't end with a colon, so
    ;; treat it specially.
-   "\\|^Enter encryption key: (repeat) *\\'")
+   "\\|^Enter encryption key: (repeat) *\\'"
+   ;; openssh-8.6p1 format: "(user@host) Password:".
+   "\\|^([^)@ \t\n]+@[^)@ \t\n]+) Password: *\\'")
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
-  :version "28.1"
+  :version "29.1"
   :type 'regexp
   :group 'comint)
 

diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el
index e1bac81a185afe53c9a0e076439e7e3087297f96..0bd5c1e9d154f9efef332cceb0e5d44d4d6edca4 100644 (file)
--- a/test/lisp/comint-tests.el
+++ b/test/lisp/comint-tests.el
@@ -43,6 +43,7 @@
     "PIN for user:"        ; Bug#35523
     "Password (again):"
     "Enter password:"
+    "(user@host) Password: " ; openssh-8.6p1
     "Current password:"    ; "passwd" (to change password) in Debian.
     "Enter encryption key: " ; ccrypt
     "Enter decryption key: " ; ccrypt