[Emacs-diffs] emacs/lisp/net tramp.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/02/01 10:46:42

Modified files:
        lisp/net       : tramp.el 

Log message:
        * net/tramp.el (tramp-read-passwd): Cached passwords shall still be 
used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.227&r2=1.228

Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- tramp.el    29 Jan 2009 16:22:58 -0000      1.227
+++ tramp.el    1 Feb 2009 10:46:42 -0000       1.228
@@ -7433,10 +7433,12 @@
              (funcall (symbol-function 'auth-source-user-or-password)
                       "password" tramp-current-host tramp-current-method))
         ;; Try the password cache.
-        (and (functionp 'password-read)
-             (tramp-get-connection-property proc "first-password-request" nil)
-             (let ((password (funcall (symbol-function 'password-read)
-                                      pw-prompt key)))
+        (when (functionp 'password-read)
+          (unless (tramp-get-connection-property
+                   proc "first-password-request" nil)
+            (funcall (symbol-function 'password-cache-remove) key))
+          (let ((password
+                 (funcall (symbol-function 'password-read) pw-prompt key)))
                (funcall (symbol-function 'password-cache-add) key password)
                password))
         ;; Else, get the password interactively.