diff options
| author | Michael Albinus | 2013-10-18 12:22:02 +0200 |
|---|---|---|
| committer | Michael Albinus | 2013-10-18 12:22:02 +0200 |
| commit | f0ff1cd5762b2485add7b2e5a1da52eab733a873 (patch) | |
| tree | c705606c6402d49371baa4e7f6bdaf5af1838526 | |
| parent | 0fc459a3f1538ecb04505031939823e88a24be14 (diff) | |
| download | emacs-f0ff1cd5762b2485add7b2e5a1da52eab733a873.tar.gz emacs-f0ff1cd5762b2485add7b2e5a1da52eab733a873.zip | |
* net/tramp-smb.el (tramp-smb-maybe-open-connection): Fix an error
introduced on 2013-09-08, which results in an infinite loop
requesting a password.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e3031dde7d8..1283b3099af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-10-18 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-smb.el (tramp-smb-maybe-open-connection): Fix an error | ||
| 4 | introduced on 2013-09-08, which results in an infinite loop | ||
| 5 | requesting a password. | ||
| 6 | |||
| 1 | 2013-10-18 Glenn Morris <rgm@gnu.org> | 7 | 2013-10-18 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * progmodes/verilog-mode.el (verilog-case-fold): Add :version. | 9 | * progmodes/verilog-mode.el (verilog-case-fold): Add :version. |
| @@ -121,7 +127,7 @@ | |||
| 121 | connection property. | 127 | connection property. |
| 122 | 128 | ||
| 123 | * net/tramp-cache.el (top): Suppress traces when reading | 129 | * net/tramp-cache.el (top): Suppress traces when reading |
| 124 | presistency file. | 130 | persistency file. |
| 125 | 131 | ||
| 126 | * net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch): | 132 | * net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch): |
| 127 | Refactor common code. Improve debug message. | 133 | Refactor common code. Improve debug message. |
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 4270ad1671c..fe7097edbde 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -1901,9 +1901,9 @@ If ARGUMENT is non-nil, use it as argument for | |||
| 1901 | (search-forward-regexp | 1901 | (search-forward-regexp |
| 1902 | tramp-smb-wrong-passwd-regexp nil t)) | 1902 | tramp-smb-wrong-passwd-regexp nil t)) |
| 1903 | ;; Disable `auth-source' and `password-cache'. | 1903 | ;; Disable `auth-source' and `password-cache'. |
| 1904 | (tramp-message | ||
| 1905 | vec 3 "Retry connection with new password") | ||
| 1906 | (let (auth-sources) | 1904 | (let (auth-sources) |
| 1905 | (tramp-message | ||
| 1906 | vec 3 "Retry connection with new password") | ||
| 1907 | (tramp-cleanup-connection vec t) | 1907 | (tramp-cleanup-connection vec t) |
| 1908 | (tramp-smb-maybe-open-connection vec argument)) | 1908 | (tramp-smb-maybe-open-connection vec argument)) |
| 1909 | ;; Propagate the error. | 1909 | ;; Propagate the error. |