2 files changed, 6 insertions, 4 deletions

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index a77fc3c6514..1df975af3d9 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -546,8 +546,8 @@ not their associated values.
   `auth' is one of the symbols `simple', `krbv41' or `krbv42'.
   `base' is the base for the search as described in RFC 1779.
   `scope' is one of the three symbols `sub', `base' or `one'.
-  `binddn' is the distinguished name of the user to bind as (in RFC 1779 syntax).
-  `auth' is one of the symbols `simple', `krbv41' or `krbv42'
+  `binddn' is the distinguished name of the user to bind as (in
+RFC 1779 syntax).
   `passwd' is the password to use for simple authentication.
   `deref' is one of the symbols `never', `always', `search' or `find'.
   `timelimit' is the timeout limit for the connection in seconds.
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index e7b3150b792..0104fa7dd12 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -374,10 +374,12 @@ asynchronously, if possible."
           (when (re-search-forward eoc nil t)
             (goto-char (match-beginning 0))
             (delete-region (point-min) (line-beginning-position))))
-        (let* ((capability-command (plist-get parameters :capability-command)))
+        (let ((capability-command (plist-get parameters :capability-command))
+              (eo-capa (or (plist-get parameters :end-of-capability)
+                           eoc)))
           (list stream
                 (network-stream-get-response stream start eoc)
-                (network-stream-command stream capability-command eoc)
+                (network-stream-command stream capability-command eo-capa)
                 'tls))))))
 
 (defun network-stream-open-shell (name buffer host service parameters)