mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-09 15:50:21 +00:00
Code Issues Releases Activity

auth-source.el (auth-source-search): Do a two-phase search, one with no :create to get the responses from all backends.

Browse Source
This commit is contained in:
Lars Ingebrigtsen 2011-02-17 23:48:59 +00:00 committed by Katsumi Yamaoka
parent 7ba93e9439
commit 1d2c4a492b
2 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/gnus/ChangeLog
View File

@ -1,5 +1,8 @@
2011-02-17 Lars Ingebrigtsen <larsi@gnus.org>
* auth-source.el (auth-source-search): Do a two-phase search, one with
no :create to get the responses from all backends.
* nnimap.el (nnimap-open-connection-1): Delete duplicate server names
when getting credentials.

71
lisp/gnus/auth-source.el
View File

@ -500,7 +500,7 @@ must call it to obtain the actual value."
unless (memq (nth i spec) ignored-keys)
collect (nth i spec)))
(found (auth-source-recall spec))
filtered-backends accessor-key found-here goal)
filtered-backends accessor-key found-here goal matches)
(if (and found auth-source-do-cache)
(auth-source-do-debug
@ -529,38 +529,57 @@ must call it to obtain the actual value."
;; (debug spec "filtered" filtered-backends)
(setq goal max)
(dolist (backend filtered-backends)
(setq found-here (apply
(slot-value backend 'search-function)
:backend backend
:create create
:delete delete
spec))
;; First go through all the backends without :create, so we can
;; query them all.
(let ((uspec (copy-sequence spec)))
(plist-put uspec :create nil)
(dolist (backend filtered-backends)
(let ((match (apply
(slot-value backend 'search-function)
:backend backend
uspec)))
(when match
(push (list backend match) matches)))))
;; If we didn't find anything, then we allow the backend(s) to
;; create the entries.
(unless matches
(let ((match (apply
(slot-value backend 'search-function)
:backend backend
:create create
:delete delete
spec)))
(when match
(push (list backend match) matches))))
;; if max is 0, as soon as we find something, return it
(when (and (zerop max) (> 0 (length found-here)))
(return t))
(setq backend (caar matches)
found-here (cadar matches))
;; decrement the goal by the number of new results
(decf goal (length found-here))
;; and append the new results to the full list
(setq found (append found found-here))
(block nil
;; if max is 0, as soon as we find something, return it
(when (and (zerop max) (> 0 (length found-here)))
(return t))
(auth-source-do-debug
"auth-source-search: found %d results (max %d/%d) in %S matching %S"
(length found-here) max goal backend spec)
;; decrement the goal by the number of new results
(decf goal (length found-here))
;; and append the new results to the full list
(setq found (append found found-here))
;; return full list if the goal is 0 or negative
(when (zerop (max 0 goal))
(return found))
(auth-source-do-debug
"auth-source-search: found %d results (max %d/%d) in %S matching %S"
(length found-here) max goal backend spec)
;; change the :max parameter in the spec to the goal
(setq spec (plist-put spec :max goal)))
;; return full list if the goal is 0 or negative
(when (zerop (max 0 goal))
(return found))
(when (and found auth-source-do-cache)
(auth-source-remember spec found)))
;; change the :max parameter in the spec to the goal
(setq spec (plist-put spec :max goal))
found))
(when (and found auth-source-do-cache)
(auth-source-remember spec found))))
found))
;;; (auth-source-search :max 1)
;;; (funcall (plist-get (nth 0 (auth-source-search :max 1)) :secret))