[gnus git] branch master updated: =1= (nnimap-credentials): Protect against auth-source-search returning nil.

       via  278f3afec4e53ae42493ce5ee3c7a73454b83304 (commit)
      from  b5b4be83e723ea2fe3be2ad26a79bdd19bdb7af1 (commit)


- Log -----------------------------------------------------------------
commit 278f3afec4e53ae42493ce5ee3c7a73454b83304
Author: Lars Ingebrigtsen <[email protected]>
Date:   Thu Feb 17 16:22:48 2011 -0800

    (nnimap-credentials): Protect against auth-source-search returning nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b4f571..f8e9364 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-18  Lars Ingebrigtsen  <[email protected]>
+
+	* nnimap.el (nnimap-log-command): Add a newline to the inhibited
+	logging.
+	(nnimap-credentials): Protect against auth-source-search returning nil.
+
 2011-02-17  Lars Ingebrigtsen  <[email protected]>
 
 	* auth-source.el (auth-source-search): Do a two-phase search, one with
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 7f8ecc1..84bbac1 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -277,15 +277,16 @@ textual parts.")
     (current-buffer)))
 
 (defun nnimap-credentials (address ports)
-  (let* ((found (nth 0 (auth-source-search :max 1
+  (let ((found (nth 0 (auth-source-search :max 1
                                            :host address
                                            :port ports
-                                           :create t)))
-         (user (plist-get found :user))
-         (secret (plist-get found :secret))
-         (secret (if (functionp secret) (funcall secret) secret)))
+					  :create t))))
     (if found
-        (list user secret)
+        (list (plist-get found :user)
+	      (let ((secret (plist-get found :secret)))
+		(if (functionp secret)
+		    (funcall secret)
+		  secret)))
       nil)))
 
 (defun nnimap-keepalive ()
@@ -1588,7 +1589,7 @@ textual parts.")
     (goto-char (point-max))
     (insert (format-time-string "%H:%M:%S") " "
 	    (if nnimap-inhibit-logging
-		"(inhibited)"
+		"(inhibited)\n"
 	      command)))
   command)
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    6 ++++++
 lisp/nnimap.el |   19 ++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project