summaryrefslogtreecommitdiff
path: root/lisp/net/ldap.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net/ldap.el')
-rw-r--r--lisp/net/ldap.el10
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 6e242d77d41..75fc7d62211 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -646,13 +646,9 @@ an alist of attribute/value pairs."
(not (equal "" sizelimit)))
(setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
(if passwd
- ;; Work around Bug#33154, see also Bug#33050. Leaving
- ;; process-connection-type at its default (typically t)
- ;; would probably be fine too, however this is the minimal
- ;; change on the release branch that fixes ldap.el on Darwin
- ;; and leaves other operating systems unchanged.
- (let* ((process-connection-type (eq system-type 'darwin))
- (proc-args (append arglist ldap-ldapsearch-args
+ ;; Leave process-connection-type at its default value. See
+ ;; discussion in Bug#33050.
+ (let* ((proc-args (append arglist ldap-ldapsearch-args
filter))
(proc (apply #'start-process "ldapsearch" buf
ldap-ldapsearch-prog