2 files changed, 15 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d395f2e3af6..9748fe1fd19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 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
         and protocol.
 
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 32e403a8718..477c21b0145 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -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.