diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/dbus.el | 4 | ||||
| -rw-r--r-- | lisp/net/tls.el | 7 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 6 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 12 |
4 files changed, 21 insertions, 8 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8f7754137cb..a7efaf81dbc 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -377,7 +377,7 @@ Example: \(dbus-call-method-asynchronously :system \"org.freedesktop.Hal\" \"/org/freedesktop/Hal/devices/computer\" - \"org.freedesktop.Hal.Device\" \"GetPropertyString\" 'message + \"org.freedesktop.Hal.Device\" \"GetPropertyString\" \\='message \"system.kernel.machine\") => \(:serial :system 2) @@ -654,7 +654,7 @@ Example: \(dbus-register-signal :system \"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" - \"org.freedesktop.Hal.Manager\" \"DeviceAdded\" 'my-signal-handler) + \"org.freedesktop.Hal.Manager\" \"DeviceAdded\" \\='my-signal-handler) => \(\(:signal :system \"org.freedesktop.Hal.Manager\" \"DeviceAdded\") \(\"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" my-signal-handler)) diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 46891be38e6..544aec5cfda 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -174,11 +174,10 @@ Used by `tls-certificate-information'." :type 'string :group 'tls) -(eval-and-compile - (if (fboundp 'format-message) - (defalias 'tls-format-message 'format-message) +(defalias 'tls-format-message + (if (fboundp 'format-message) 'format-message ;; for Emacs < 25, and XEmacs, don't worry about quote translation. - (defalias 'tls-format-message 'format))) + 'format)) (defun tls-certificate-information (der) "Parse X.509 certificate in DER format into an assoc list." diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8cae8dc92b9..79b024e8310 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -288,7 +288,10 @@ The string is used in `tramp-methods'.") (add-to-list 'tramp-methods '("sudo" (tramp-login-program "sudo") - (tramp-login-args (("-u" "%u") ("-s") ("-H") ("-p" "Password:"))) + ;; The password template must be masked. Otherwise, it could be + ;; interpreted as password prompt if the remote host echoes the command. + (tramp-login-args (("-u" "%u") ("-s") ("-H") + ("-p" "P\"\"a\"\"s\"\"s\"\"w\"\"o\"\"r\"\"d\"\":"))) ;; Local $SHELL could be a nasty one, like zsh or fish. Let's override it. (tramp-login-env (("SHELL") ("/bin/sh"))) (tramp-remote-shell "/bin/sh") @@ -4316,6 +4319,7 @@ with the encoded or decoded results, respectively.") ;; However, I don't know whether all base64 versions do supports ;; this option. (b64 "base64" "base64 -d") + (b64 "openssl enc -base64" "openssl enc -d -base64") (b64 "mimencode -b" "mimencode -u -b") (b64 "mmencode -b" "mmencode -u -b") (b64 "recode data..base64" "recode base64..data") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index bf3e1c740de..6cec3c55bc9 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1750,7 +1750,7 @@ Example: (tramp-set-completion-function \"ssh\" - '((tramp-parse-sconfig \"/etc/ssh_config\") + \\='((tramp-parse-sconfig \"/etc/ssh_config\") (tramp-parse-sconfig \"~/.ssh/config\")))" (let ((r function-list) @@ -4258,6 +4258,16 @@ Invokes `password-read' if available, `read-passwd' else." ;;;###tramp-autoload (defun tramp-clear-passwd (vec) "Clear password cache for connection related to VEC." + (let ((hop (tramp-file-name-hop vec))) + (when hop + ;; Clear also the passwords of the hops. + (tramp-clear-passwd + (tramp-dissect-file-name + (concat + tramp-prefix-format + (tramp-compat-replace-regexp-in-string + (concat tramp-postfix-hop-regexp "$") + tramp-postfix-host-format hop)))))) (tramp-compat-funcall 'password-cache-remove (tramp-make-tramp-file-name |