diff options
-rw-r--r-- | lisp/ChangeLog | 4 | ||||
-rw-r--r-- | lisp/net/ldap.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3f0f8e85271..2ba9a86ea80 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-01-08 Eric Hanchrow <eric.hanchrow@gmail.com> + + * net/ldap.el (ldap-search-internal): Discard stderr output. + 2011-01-07 Eli Zaretskii <eliz@gnu.org> * files.el (directory-abbrev-alist): Doc fix. (Bug#7777) diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index afdb0fe3e13..f1cc534ae85 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -558,7 +558,8 @@ an alist of attribute/value pairs." (setq arglist (nconc arglist (list (format "-z%s" sizelimit))))) (eval `(call-process ldap-ldapsearch-prog nil - buf + ;; Ignore stderr, which can corrupt results + (list buf nil) nil ,@arglist ,@ldap-ldapsearch-args |