aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Fitzsimmons2018-10-26 16:53:19 -0400
committerEli Zaretskii2018-11-29 12:39:34 +0200
commit809989f79ee4038f50d18765c4b727c8451ae0da (patch)
treeced9b9256c078d3b34654510e8a1a2beac625b73
parent74a3a795afbf092d4086e5ebb4dcf0254e7c8b46 (diff)
downloademacs-809989f79ee4038f50d18765c4b727c8451ae0da.tar.gz
emacs-809989f79ee4038f50d18765c4b727c8451ae0da.zip
LDAP: Set process-connection-type to t on Darwin
* lisp/net/ldap.el (ldap-search-internal): Set process-connection-type to t on Darwin. Do not merge to master. (Bug#33050)
-rw-r--r--lisp/net/ldap.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 7b47a54b9fb..b106de02e9b 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -646,7 +646,12 @@ an alist of attribute/value pairs."
646 (not (equal "" sizelimit))) 646 (not (equal "" sizelimit)))
647 (setq arglist (nconc arglist (list (format "-z%s" sizelimit))))) 647 (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
648 (if passwd 648 (if passwd
649 (let* ((process-connection-type nil) 649 ;; Work around Bug#33154, see also Bug#33050. Leaving
650 ;; process-connection-type at its default (typically t)
651 ;; would probably be fine too, however this is the minimal
652 ;; change on the release branch that fixes ldap.el on Darwin
653 ;; and leaves other operating systems unchanged.
654 (let* ((process-connection-type (eq system-type 'darwin))
650 (proc-args (append arglist ldap-ldapsearch-args 655 (proc-args (append arglist ldap-ldapsearch-args
651 filter)) 656 filter))
652 (proc (apply #'start-process "ldapsearch" buf 657 (proc (apply #'start-process "ldapsearch" buf