emacs-jabber jabber-sasl.el,2.10,2.11 jabber-logon.el,1.13,1.14

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv5957

Modified Files:
	jabber-sasl.el jabber-logon.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-394
Creator:  Magnus Henoch <ma...@fr...>

Fix password reading functions


Index: jabber-sasl.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-sasl.el,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- jabber-sasl.el	24 Aug 2007 02:43:50 -0000	2.10
+++ jabber-sasl.el	24 Aug 2007 03:12:14 -0000	2.11
@@ -81,7 +81,9 @@
 	  (cons client step))))))
 
 (defun jabber-sasl-process-input (jc xml-data sasl-data)
-  (let ((sasl-read-passphrase #'jabber-read-password)
+  (let ((sasl-read-passphrase (lexical-let ((bare-jid (jabber-connection-bare-jid jc)))
+				(lambda (prompt)
+				  (jabber-read-password bare-jid prompt))))
 	(client (car sasl-data))
 	(step (cdr sasl-data)))
     (cond

Index: jabber-logon.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-logon.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jabber-logon.el	24 Aug 2007 02:43:50 -0000	1.13
+++ jabber-logon.el	24 Aug 2007 03:12:14 -0000	1.14
@@ -40,13 +40,13 @@
   (let (auth)
     (if (jabber-xml-get-children (jabber-iq-query xml-data) 'digest)
 	;; SHA1 digest passwords allowed
-	(let ((passwd (jabber-read-passwd)))
+	(let ((passwd (jabber-read-password (jabber-connection-bare-jid jc))))
 	  (if passwd
 	      (setq auth `(digest () ,(sha1 (concat session-id passwd))))))
       ;; Plaintext passwords - allow on encrypted connections
       (if (or *jabber-encrypted*
 	      (yes-or-no-p "Jabber server only allows cleartext password transmission!  Continue? "))
-	  (let ((passwd (jabber-read-passwd)))
+	  (let ((passwd (jabber-read-password (jabber-connection-bare-jid jc))))
 	    (when passwd
 	      (setq auth `(password () ,passwd))))))