From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Mastro Newsgroups: gmane.emacs.bugs Subject: bug#19074: Bug in auth-source.el's search of OS X Keychain Date: Sun, 16 Nov 2014 21:38:32 -0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416202767 31286 80.91.229.3 (17 Nov 2014 05:39:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 05:39:27 +0000 (UTC) To: 19074@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 17 06:39:20 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqF1y-0001ZF-TY for geb-bug-gnu-emacs@m.gmane.org; Mon, 17 Nov 2014 06:39:19 +0100 Original-Received: from localhost ([::1]:46287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqF1y-0003RS-GA for geb-bug-gnu-emacs@m.gmane.org; Mon, 17 Nov 2014 00:39:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqF1p-0003RB-Vx for bug-gnu-emacs@gnu.org; Mon, 17 Nov 2014 00:39:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqF1k-0005Hb-Ka for bug-gnu-emacs@gnu.org; Mon, 17 Nov 2014 00:39:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:38484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqF1k-0005HV-A3 for bug-gnu-emacs@gnu.org; Mon, 17 Nov 2014 00:39:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XqF1j-0007AX-Bj for bug-gnu-emacs@gnu.org; Mon, 17 Nov 2014 00:39:03 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: John Mastro Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 17 Nov 2014 05:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19074 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19074-submit@debbugs.gnu.org id=B19074.141620272327494 (code B ref 19074); Mon, 17 Nov 2014 05:39:02 +0000 Original-Received: (at 19074) by debbugs.gnu.org; 17 Nov 2014 05:38:43 +0000 Original-Received: from localhost ([127.0.0.1]:35697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqF1O-00079K-Dw for submit@debbugs.gnu.org; Mon, 17 Nov 2014 00:38:43 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:47735) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqF1H-00078q-5y for 19074@debbugs.gnu.org; Mon, 17 Nov 2014 00:38:36 -0500 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 36C502078F for <19074@debbugs.gnu.org>; Mon, 17 Nov 2014 00:38:34 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute2.internal (MEProxy); Mon, 17 Nov 2014 00:38:34 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=jbm.io; h= x-sasl-enc:from:to:subject:date:message-id:mime-version :content-type; s=mesmtp; bh=0hqGY+Tu5rlpD3yAZoS3bGJ+6HI=; b=MQxP 8mE5CDXmlDgfNFfsoRtnUIk1xwd4STiJQJDnWhgdvFj0qC19n52SzfiuU8rQXtaN 7LzSkqZprrMDcJtku8VwbHH7M7LKjxl4zWTLg7eTVxjQxr2mTEMz0Gwyegbsujjp 7u/BIVCAIhMRykd/HGwqnawH2uRYf3GR4mO6mAw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:subject:date :message-id:mime-version:content-type; s=smtpout; bh=0hqGY+Tu5rl pD3yAZoS3bGJ+6HI=; b=h4DVlSDC/OoQlNvio7s/Fp/sL/tQfSMiPuEnhYpVKs5 eA2iBHhzoIIZ0u4sr/c31AgXZQepeBRcMiU1344voPsfpgDW4YihA6Vd4L+gVf5U ZeQ5A5t2Dl3TdLFwHrp/X+nII9bvRrW2p07xaKb+EReZnVx3IFb1SPzEAt9ecCOs = X-Sasl-enc: ZxrnmJcFILB92tc5fGr9VWQ/hmlb3JIiySMoyfuWKsRn 1416202713 Original-Received: from nebula.local (unknown [23.240.150.50]) by mail.messagingengine.com (Postfix) with ESMTPA id B7261680163 for <19074@debbugs.gnu.org>; Mon, 17 Nov 2014 00:38:33 -0500 (EST) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:96143 I accidentally copied only part of the patch in my original email. The full thing (via `git format-patch') follows. -- jbm >From 2b968a29ff2a01e316e09faa4d765aca08cf0121 Mon Sep 17 00:00:00 2001 From: John Mastro Date: Sun, 16 Nov 2014 19:41:10 -0800 Subject: [PATCH] Fix auth-source.el bug regarding the OS X Keychain In `auth-source-macos-keychain-search-items', the return value of `auth-source-macos-keychain-result-append' was being ignored. This caused the intended result not to be returned. --- lisp/gnus/auth-source.el | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index a50ad75..72ec5f4 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -1779,29 +1779,29 @@ entries for git.gnus.org: (while (not (eobp)) (cond ((looking-at "^password: \"\\(.+\\)\"$") - (auth-source-macos-keychain-result-append - ret - keychain-generic - "secret" - (lexical-let ((v (match-string 1))) - (lambda () v)))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + "secret" + (lexical-let ((v (match-string 1))) + (lambda () v))))) ;; TODO: check if this is really the label ;; match 0x00000007 ="AppleID" ((looking-at "^[ ]+0x00000007 =\"\\(.+\\)\"") - (auth-source-macos-keychain-result-append - ret - keychain-generic - "label" - (match-string 1))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + "label" + (match-string 1)))) ;; match "crtr"="aapl" ;; match "svce"="AppleID" ((looking-at "^[ ]+\"\\([a-z]+\\)\"[^=]+=\"\\(.+\\)\"") - (auth-source-macos-keychain-result-append - ret - keychain-generic - (match-string 1) - (match-string 2)))) - (forward-line))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + (match-string 1) + (match-string 2))))) + (forward-line))) ;; return `ret' iff it has the :secret key (and (plist-get ret :secret) (list ret)))) -- 2.1.3