diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2018-10-26 16:53:19 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-11-29 12:39:34 +0200 |
| commit | 809989f79ee4038f50d18765c4b727c8451ae0da (patch) | |
| tree | ced9b9256c078d3b34654510e8a1a2beac625b73 /lisp/net/ldap.el | |
| parent | 74a3a795afbf092d4086e5ebb4dcf0254e7c8b46 (diff) | |
| download | emacs-809989f79ee4038f50d18765c4b727c8451ae0da.tar.gz emacs-809989f79ee4038f50d18765c4b727c8451ae0da.tar.bz2 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)
Diffstat (limited to 'lisp/net/ldap.el')
| -rw-r--r-- | lisp/net/ldap.el | 7 |
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." (not (equal "" sizelimit))) (setq arglist (nconc arglist (list (format "-z%s" sizelimit))))) (if passwd - (let* ((process-connection-type nil) + ;; 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 filter)) (proc (apply #'start-process "ldapsearch" buf |