auth-source: ignore :require and :type in secrets and plstore search spec

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 065d477..b8abc61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-10  Daiki Ueno <ueno@unixuser.org>
+
+       * auth-source.el: (auth-source-plstore-search)
+       (auth-source-secrets-search): Ignore :require and :type in search spec.
+
 2012-08-06  Julien Danjou  <julien@danjou.info>
 
        * nnimap.el (nnimap-request-head): Resture to-buffer parameter, used by

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index c8810bc..46fba78 100644 (file)
--- 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)))