From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 9 Jan 2011 19:34:19 +0000 (+0100)
Subject: * lisp/net/ldap.el (ldap-search-internal): Don't use eval.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~239^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8043a225f70715109eb40a5ab178a97233670ee;p=emacs.git

* lisp/net/ldap.el (ldap-search-internal): Don't use eval.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6da2fe1abb3..5cab10de20d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* net/ldap.el (ldap-search-internal): Don't use eval.
+
 2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* subr.el (read-char-choice): Use read-key.
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 066dbd8bea0..88284af06f0 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,7 +1,7 @@
 ;;; 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.
+;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: FSF
@@ -556,13 +556,9 @@ 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
+	     nil buf nil
+	     (append arglist ldap-ldapsearch-args filter))
       (insert "\n")
       (goto-char (point-min))