procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle nil password-cache in ldap-password-read

Browse source 
* net/ldap.el (ldap-password-read): Handle password-cache being
nil.
This commit is contained in:
Thomas Fitzsimmons 2014-11-13 02:43:36 -05:00
parent 81d0909b70
commit 9006ccd6c2
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org>
* net/ldap.el (ldap-password-read): Handle password-cache being
nil.
2014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org>
* net/eudc.el (eudc-expand-inline): Always restore former server

20
lisp/net/ldap.el
View file

@ -487,16 +487,16 @@ Additional search parameters can be specified through
"Read LDAP password for HOST. If the password is cached, it is
read from the cache, otherwise the user is prompted for the
password and the password is cached. The cache can be cleared
with `password-reset`."
;; Add ldap: namespace to allow empty string for default host.
(let ((host-key (concat "ldap:" host)))
(when (not (password-in-cache-p host-key))
(password-cache-add host-key (password-read
(format "Enter LDAP Password%s: "
(if (equal host "")
""
(format " for %s" host))))))
(password-read-from-cache host-key)))
with the `password-reset' function and the
`password-cache-expiry' variable controls how long the password
is cached for."
(password-read-and-add
(format "Enter LDAP Password%s: "
(if (equal host "")
""
(format " for %s" host)))
;; Add ldap: namespace to allow empty string for default host.
(concat "ldap:" host)))
(defun ldap-search-internal (search-plist)
"Perform a search on a LDAP server.