From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Jun Hao" Newsgroups: gmane.emacs.bugs Subject: bug#23374: auth-source-macos-keychain-search pass in port only if it's provided Date: Mon, 25 Apr 2016 23:11:02 +0800 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1461597143 25795 80.91.229.3 (25 Apr 2016 15:12:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Apr 2016 15:12:23 +0000 (UTC) To: 23374@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 25 17:12:11 2016 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 1auiBG-0002lb-CE for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Apr 2016 17:12:10 +0200 Original-Received: from localhost ([::1]:60618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auiBF-00081k-OU for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Apr 2016 11:12:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auiBC-0007zv-4f for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:12:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1auiB8-0006Xp-45 for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:12:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auiB8-0006XP-1k for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:12:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1auiB7-0003IP-Sc for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:12:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Jun Hao" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Apr 2016 15:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 23374 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.146159710212637 (code B ref -1); Mon, 25 Apr 2016 15:12:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 25 Apr 2016 15:11:42 +0000 Original-Received: from localhost ([127.0.0.1]:46644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1auiAo-0003Hl-1X for submit@debbugs.gnu.org; Mon, 25 Apr 2016 11:11:42 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1auiAm-0003HZ-2K for submit@debbugs.gnu.org; Mon, 25 Apr 2016 11:11:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1auiAb-0005n6-66 for submit@debbugs.gnu.org; Mon, 25 Apr 2016 11:11:34 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:34028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auiAb-0005n0-2e for submit@debbugs.gnu.org; Mon, 25 Apr 2016 11:11:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auiAX-00079U-47 for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:11:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1auiAT-0005gt-3J for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:11:25 -0400 Original-Received: from oms-a012e.mx.aol.com ([204.29.186.157]:45907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auiAS-0005fM-TK for bug-gnu-emacs@gnu.org; Mon, 25 Apr 2016 11:11:21 -0400 Original-Received: from omr-m006e.mx.aol.com (omr-m006.mx.aol.com [10.74.117.73]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by oms-a012e.mx.aol.com (AOL Outbound OMS Interface) with ESMTPS id 2AE3A3800158 for ; Mon, 25 Apr 2016 11:11:19 -0400 (EDT) Original-Received: from mtaout-mbd02.mx.aol.com (mtaout-mbd02.mx.aol.com [172.26.252.14]) by omr-m006e.mx.aol.com (Outbound Mail Relay) with ESMTP id 1D4013800089 for ; Mon, 25 Apr 2016 11:11:19 -0400 (EDT) Original-Received: from localhost (unknown [114.250.252.238]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mtaout-mbd02.mx.aol.com (MUA/Third Party Client Interface) with ESMTPSA id 4C6963800008C for ; Mon, 25 Apr 2016 11:11:14 -0400 (EDT) User-agent: mu4e 0.9.17; emacs 24.5.1 x-aol-global-disposition: S X-AOL-VSS-INFO: 5800.7501/109502 X-AOL-VSS-CODE: clean DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aol.com; s=20150623; t=1461597079; bh=kcmcGXvlzJyzWuq2kcPd8KctguEPc+xkQeVqfyCDZxo=; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type; b=TIkeem+vEYuyB4F5YaKgpO+wJ2J31NerPPad7Ms0pPu9pvbtIsihv8BjAzlh7yjUC b/qfuXnMAYbrD3pMFW6eUVD0nJg6O0OaUUOJ2mwgCkqOGXT6IwL9w2Y0+MhR6GK1/b BTvRV1RXNoYxzenNUxx3jqFD1ry5z1yq7PpaCDlU= X-AOL-REROUTE: YES x-aol-sid: 3039ac1afc0e571e33927adc X-AOL-IP: 114.250.252.238 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:116824 Archived-At: --=-=-= Content-Type: text/plain Hi, When calling auth-source-search without port on OSX, current code will bind port to "nil" and generate wrong command. E.g: (auth-source-search :user "test") will yield command: /usr/bin/security find-generic-password -g -a "test" -s "nil" The correct one should be: /usr/bin/security find-generic-password -g -a "test" Please see attachment for this simple patch Thanks - Jun --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Pass-in-port-only-if-provided-by-caller.patch >From b643d8a8a49d273bc7f7d70339c8026008634055 Mon Sep 17 00:00:00 2001 From: Jun Hao Date: Mon, 25 Apr 2016 22:53:24 +0800 Subject: [PATCH] Pass in port only if provided by caller * lisp/auth-source.el (auth-source-macos-keychain-search): pass in port only if provided --- lisp/auth-source.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/auth-source.el b/lisp/auth-source.el index d691b54..fe28a02 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -1735,7 +1735,7 @@ entries for git.gnus.org: (items (catch 'match (dolist (host hosts) (dolist (port ports) - (let* ((port (format "%S" port)) + (let* ((port (if port (format "%S" port))) (items (apply #'auth-source-macos-keychain-search-items coll type -- 2.8.1 --=-=-=--