Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv2434
Modified Files:
jabber-util.el jabber-logon.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-415
Creator: Magnus Henoch <ma...@fr...>
Don't use jabber-password
Index: jabber-util.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-util.el,v
retrieving revision 2.51
retrieving revision 2.52
diff -u -d -r2.51 -r2.52
--- jabber-util.el 31 Aug 2007 21:45:12 -0000 2.51
+++ jabber-util.el 17 Sep 2007 20:25:44 -0000 2.52
@@ -261,18 +261,13 @@
(concat "xmpp:" bare-jid))
(defun jabber-read-password (bare-jid)
- "Read Jabber password, either from customized variable or from minibuffer.
-See `jabber-password'."
- (if jabber-password
- ;; Need to copy the password, as sasl.el wants to erase it. The
- ;; variable jabber-password is a high-convenience low-security
- ;; alternative anyway.
- (copy-sequence jabber-password)
- (let ((prompt (format "Jabber password for %s: " bare-jid)))
- (if (fboundp 'password-read-and-add)
- (copy-sequence
- (password-read-and-add prompt (jabber-password-key bare-jid)))
- (read-passwd prompt)))))
+ "Read Jabber password from minibuffer."
+ (let ((prompt (format "Jabber password for %s: " bare-jid)))
+ (if (fboundp 'password-read-and-add)
+ ;; Need to copy the password, as sasl.el wants to erase it.
+ (copy-sequence
+ (password-read-and-add prompt (jabber-password-key bare-jid)))
+ (read-passwd prompt))))
(defun jabber-uncache-password (bare-jid)
"Uncache cached password for BARE-JID.
Index: jabber-logon.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-logon.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- jabber-logon.el 17 Sep 2007 12:16:35 -0000 1.17
+++ jabber-logon.el 17 Sep 2007 20:25:44 -0000 1.18
@@ -47,7 +47,8 @@
;; Plaintext passwords - allow on encrypted connections
(if (or (plist-get (fsm-get-state-data jc) :encrypted)
(yes-or-no-p "Jabber server only allows cleartext password transmission! Continue? "))
- (let ((passwd (jabber-read-password (jabber-connection-bare-jid jc))))
+ (let ((passwd (or (plist-get (fsm-get-state-data jc) :password)
+ (jabber-read-password (jabber-connection-bare-jid jc)))))
(when passwd
(setq auth `(password () ,passwd))))))
|
