(smtpmail-send-command): Don't include AUTH passwords in the log buffer

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8c50789a84f77febe1d6806d3edfdab7a17a198..6804f4150aff6bf9d2fa562d4634d671a8d64013 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail/smtpmail.el (smtpmail-send-command): Don't include AUTH
+       passwords in the log buffer.
+
 2011-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/bibtex.el (bibtex-complete-string-cleanup)

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 544570a1bc3b1cd4761f0b2faf4181e75e092c0b..42c43c0951c264205cbd291c7c5ab3c37a73d17b 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -891,8 +891,8 @@ The list is in preference order.")
 
 (defun smtpmail-send-command (process command)
   (goto-char (point-max))
-  (if (= (aref command 0) ?P)
-      (insert "PASS <omitted>\r\n")
+  (if (string-match "\\`AUTH [A-Z]+ " command)
+      (insert (match-string 0 command) "<omitted>\r\n")
     (insert command "\r\n"))
   (setq smtpmail-read-point (point))
   (process-send-string process command)