summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/net/sasl.el9
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 7f0431afb60..d2e08f7e3ed 100644
--- a/lisp/net/sasl.el
+++ b/lisp/net/sasl.el
@@ -161,15 +161,8 @@ the current challenge. At the first time STEP should be set to nil."
(if function
(vector function (funcall function client step)))))
-(defvar sasl-read-passphrase nil)
+(defvar sasl-read-passphrase 'read-passwd)
(defun sasl-read-passphrase (prompt)
- (if (not sasl-read-passphrase)
- (if (functionp 'read-passwd)
- (setq sasl-read-passphrase 'read-passwd)
- (if (load "passwd" t)
- (setq sasl-read-passphrase 'read-passwd)
- (autoload 'ange-ftp-read-passwd "ange-ftp")
- (setq sasl-read-passphrase 'ange-ftp-read-passwd))))
(funcall sasl-read-passphrase prompt))
(defun sasl-unique-id ()