auth-source regression

[Daiki Ueno <ueno@unixuser.org>]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

Hi,

Today I noticed that the current auth-source-search always returns empty
result.  It seems that you recently changed auth-source.el to pass :type
to search-function, but forgot to filter out the keyword from the search
spec in auth-source-secrets-search and auth-sourec-plstore-search.

I tested the attached patch with plstore but not with secrets.  If it
makes sense please apply.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-auth-source-ignore-some-keywords-in-search-spec.patch --]
[-- Type: text/x-patch, Size: 1471 bytes --]

From 744fb2a6b7a3b4bfbd822a277ef3672e83309737 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 10 Aug 2012 18:32:10 +0900
Subject: [PATCH] auth-source: ignore some keywords in search spec

---
 lisp/auth-source.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index c8810bc..46fba78 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1542,7 +1542,7 @@ authentication tokens:
 
   (let* ((coll (oref backend source))
          (max (or max 5000))     ; sanity check: default to stop at 5K
-         (ignored-keys '(:create :delete :max :backend :label))
+         (ignored-keys '(:create :delete :max :backend :label :require :type))
          (search-keys (loop for i below (length spec) by 2
                             unless (memq (nth i spec) ignored-keys)
                             collect (nth i spec)))
@@ -1797,7 +1797,7 @@ entries for git.gnus.org:
   "Search the PLSTORE; spec is like `auth-source'."
   (let* ((store (oref backend data))
          (max (or max 5000))     ; sanity check: default to stop at 5K
-         (ignored-keys '(:create :delete :max :backend :require))
+         (ignored-keys '(:create :delete :max :backend :label :require :type))
          (search-keys (loop for i below (length spec) by 2
                             unless (memq (nth i spec) ignored-keys)
                             collect (nth i spec)))
-- 
1.7.11.2


[-- Attachment #3: Type: text/plain, Size: 25 bytes --]


Regards,
-- 
Daiki Ueno