[gnus git] branch master updated: m0-11-87-gba115d0 =1= auth-source.el: Fix Mac OS X keychain lookups

       via  ba115d03543f5f95fb3251a619d42aa9f7177327 (commit)
      from  6e88d2f43412f0b8daf407ae6395c64219c2a59f (commit)


- Log -----------------------------------------------------------------
commit ba115d03543f5f95fb3251a619d42aa9f7177327
Author: John Mastro <[email protected]>
Date:   Wed Nov 26 22:29:51 2014 +0000

    auth-source.el: Fix Mac OS X keychain lookups

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b4b2df..183df44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-26  John Mastro  <[email protected]>  (tiny change)
+
+	* auth-source.el (auth-source-macos-keychain-search-items): Return
+	result of `auth-source-macos-keychain-result-append' (bug#19074).
+
 2014-11-25  Glenn Morris  <[email protected]>
 
 	* gnus-start.el (gnus-save-newsrc-file-check-timestamp):
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 2b48c0c..0216dee 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1797,28 +1797,28 @@ entries for git.gnus.org:
         (while (not (eobp))
           (cond
            ((looking-at "^password: \"\\(.+\\)\"$")
-            (auth-source-macos-keychain-result-append
+            (setq ret (auth-source-macos-keychain-result-append
                        ret
                        keychain-generic
                        "secret"
                        (lexical-let ((v (match-string 1)))
-               (lambda () v))))
+                         (lambda () v)))))
            ;; TODO: check if this is really the label
            ;; match 0x00000007 <blob>="AppleID"
            ((looking-at "^[ ]+0x00000007 <blob>=\"\\(.+\\)\"")
-            (auth-source-macos-keychain-result-append
+            (setq ret (auth-source-macos-keychain-result-append
                        ret
                        keychain-generic
                        "label"
-             (match-string 1)))
+                       (match-string 1))))
            ;; match "crtr"<uint32>="aapl"
            ;; match "svce"<blob>="AppleID"
            ((looking-at "^[ ]+\"\\([a-z]+\\)\"[^=]+=\"\\(.+\\)\"")
-            (auth-source-macos-keychain-result-append
+            (setq ret (auth-source-macos-keychain-result-append
                        ret
                        keychain-generic
                        (match-string 1)
-             (match-string 2))))
+                       (match-string 2)))))
           (forward-line)))
       ;; return `ret' iff it has the :secret key
       (and (plist-get ret :secret) (list ret))))

-----------------------------------------------------------------------
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      |    5 +++++
 lisp/auth-source.el |   34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 17 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