X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9b026d9f13d4a7694e9dfebce171564cf8ec2dd4..73b0cd50031a714347109169ceb8bacae338612a:/lisp/net/ldap.el

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 066dbd8bea..3ccad277ff 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,7 +1,6 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2011  Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: FSF
@@ -556,13 +555,10 @@ an alist of attribute/value pairs."
       (if (and sizelimit
 	       (not (equal "" sizelimit)))
 	  (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
-      (eval `(call-process ldap-ldapsearch-prog
-			   nil
-			   buf
-			   nil
-			   ,@arglist
-			   ,@ldap-ldapsearch-args
-			   ,@filter))
+      (apply #'call-process ldap-ldapsearch-prog
+	     ;; Ignore stderr, which can corrupt results
+	     nil (list buf nil) nil
+	     (append arglist ldap-ldapsearch-args filter))
       (insert "\n")
       (goto-char (point-min))