* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3031dde7d88311bc3546ab5054061f5748f3364..1283b3099af9959390973b74c6d54a21a0ebc3d4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-18  Michael Albinus  <michael.albinus@gmx.de>
+
+       * 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.
+
 2013-10-18  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/verilog-mode.el (verilog-case-fold): Add :version.
@@ -121,7 +127,7 @@
        connection property.
 
        * net/tramp-cache.el (top): Suppress traces when reading
-       presistency file.
+       persistency file.
 
        * net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
        Refactor common code.  Improve debug message.

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 4270ad1671c772264cdadde01fc5c35a31d6025a..fe7097edbde45e4972c1e2be55ff474f771b81a2 100644 (file)
--- 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
                            (search-forward-regexp
                             tramp-smb-wrong-passwd-regexp nil t))
                       ;; Disable `auth-source' and `password-cache'.
-                      (tramp-message
-                       vec 3 "Retry connection with new password")
                       (let (auth-sources)
+                        (tramp-message
+                         vec 3 "Retry connection with new password")
                         (tramp-cleanup-connection vec t)
                         (tramp-smb-maybe-open-connection vec argument))
                     ;; Propagate the error.