From f6d3005069551f3ed5817078a095b868007bf12d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 13 May 2019 18:39:32 -0400 Subject: [PATCH] Add "Enter Auth" prompt handling for OpenVPN (Bug#35724) * lisp/comint.el (comint-password-prompt-regexp): Allow "Enter Auth" at the beginning. --- lisp/comint.el | 5 +++-- test/lisp/comint-tests.el | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/comint.el b/lisp/comint.el index 3939371ab85..b6ed199327e 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -349,13 +349,14 @@ This variable is buffer-local." ;; Ubuntu's sudo prompts like `[sudo] password for user:' ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. ;; Something called "perforce" uses "Enter password:". -;; See M-x comint-testsuite--test-comint-password-prompt-regexp. +;; OpenVPN prints a prompt like: "Enter Auth Password:". +;; See ert test `comint-test-password-regexp'. (defcustom comint-password-prompt-regexp (concat "\\(^ *\\|" (regexp-opt '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the" - "Old" "old" "New" "new" "'s" "login" + "Enter Auth" "enter auth" "Old" "old" "New" "new" "'s" "login" "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "PEM" "SUDO" "[sudo]" "Repeat" "Bad" "Retype") t) diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 49e59c526f4..0d2d648bbae 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -39,6 +39,7 @@ "[sudo] user 的密码：" ; localized "Password (again):" "Enter password:" + "Enter Auth Password:" ; OpenVPN (Bug#35724) "Mot de Passe :" ; localized (Bug#29729) "Passwort:") ; localized "List of strings that should match `comint-password-prompt-regexp'.") -- 2.39.2