aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2004-04-12 04:12:02 +0000
committerStefan Monnier2004-04-12 04:12:02 +0000
commit4a8da016cac6ccf23b2f846bc1e212443b7888a0 (patch)
tree9e87c28b40a6c4089045eca2df6d6991adc452c4
parent016da1c19d23e8c5c9bd4cbb603648a2b4145f19 (diff)
downloademacs-4a8da016cac6ccf23b2f846bc1e212443b7888a0.tar.gz
emacs-4a8da016cac6ccf23b2f846bc1e212443b7888a0.zip
(ldap-search): Use list*.
-rw-r--r--lisp/net/ldap.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 93802d5744a..55af47e6a87 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,6 +1,6 @@
1;;; ldap.el --- client interface to LDAP for Emacs 1;;; ldap.el --- client interface to LDAP for Emacs
2 2
3;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 1999, 2000, 02, 2004 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -36,6 +36,7 @@
36;;; Code: 36;;; Code:
37 37
38(require 'custom) 38(require 'custom)
39(eval-when-compile (require 'cl))
39 40
40(defgroup ldap nil 41(defgroup ldap nil
41 "Lightweight Directory Access Protocol." 42 "Lightweight Directory Access Protocol."
@@ -464,17 +465,16 @@ Additional search parameters can be specified through
464 (error "No LDAP host specified")) 465 (error "No LDAP host specified"))
465 (let ((host-plist (cdr (assoc host ldap-host-parameters-alist))) 466 (let ((host-plist (cdr (assoc host ldap-host-parameters-alist)))
466 result) 467 result)
467 (setq result (ldap-search-internal (append host-plist 468 (setq result (ldap-search-internal (list* 'host host
468 (list 'host host 469 'filter filter
469 'filter filter 470 'attributes attributes
470 'attributes attributes 471 'attrsonly attrsonly
471 'attrsonly attrsonly 472 'withdn withdn
472 'withdn withdn)))) 473 host-plist)))
473 (if ldap-ignore-attribute-codings 474 (if ldap-ignore-attribute-codings
474 result 475 result
475 (mapcar (function 476 (mapcar (lambda (record)
476 (lambda (record) 477 (mapcar 'ldap-decode-attribute record))
477 (mapcar 'ldap-decode-attribute record)))
478 result)))) 478 result))))
479 479
480 480