Remove Emacs 21 compat code from sasl.el

* lisp/net/sasl.el (sasl-read-passphrase): Remove compat code;
'read-passwd' is preloaded since Emacs 22.

diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 7f0431afb60f20e3ef9b8b90a53945af70a0abe7..d2e08f7e3ed369588eafb0ac29f7e2f907330a96 100644 (file)
--- 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 ()