aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Hanchrow2011-01-08 14:49:02 -0500
committerChong Yidong2011-01-08 14:49:02 -0500
commit83affcb07a8d5e297e66685eb94cec3fd8ce297b (patch)
tree3c1da9f62e8b78f70d5b4071aad565581b7eb064
parent4320be4251090803282bcd80937342fda25b4ccb (diff)
downloademacs-83affcb07a8d5e297e66685eb94cec3fd8ce297b.tar.gz
emacs-83affcb07a8d5e297e66685eb94cec3fd8ce297b.zip
* net/ldap.el (ldap-search-internal): Discard stderr output.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/ldap.el3
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 @@
12011-01-08 Eric Hanchrow <eric.hanchrow@gmail.com>
2
3 * net/ldap.el (ldap-search-internal): Discard stderr output.
4
12011-01-07 Eli Zaretskii <eliz@gnu.org> 52011-01-07 Eli Zaretskii <eliz@gnu.org>
2 6
3 * files.el (directory-abbrev-alist): Doc fix. (Bug#7777) 7 * 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."
558 (setq arglist (nconc arglist (list (format "-z%s" sizelimit))))) 558 (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
559 (eval `(call-process ldap-ldapsearch-prog 559 (eval `(call-process ldap-ldapsearch-prog
560 nil 560 nil
561 buf 561 ;; Ignore stderr, which can corrupt results
562 (list buf nil)
562 nil 563 nil
563 ,@arglist 564 ,@arglist
564 ,@ldap-ldapsearch-args 565 ,@ldap-ldapsearch-args