diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/net/eudcb-ldap.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/net/eudcb-ldap.el')
| -rw-r--r-- | lisp/net/eudcb-ldap.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 4623079ea9f..0aff276475e 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -1,4 +1,4 @@ -;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend +;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -*- lexical-binding: t; -*- ;; Copyright (C) 1998-2021 Free Software Foundation, Inc. @@ -38,10 +38,10 @@ ;;{{{ Internal cooking -(eval-and-compile +(defalias 'eudc-ldap-get-host-parameter (if (fboundp 'ldap-get-host-parameter) - (fset 'eudc-ldap-get-host-parameter 'ldap-get-host-parameter) - (defun eudc-ldap-get-host-parameter (host parameter) + #'ldap-get-host-parameter + (lambda (host parameter) "Get the value of PARAMETER for HOST in `ldap-host-parameters-alist'." (plist-get (cdr (assoc host ldap-host-parameters-alist)) parameter)))) @@ -84,7 +84,7 @@ record)) (defun eudc-filter-$ (string) - (mapconcat 'identity (split-string string "\\$") "\n")) + (mapconcat #'identity (split-string string "\\$") "\n")) (defun eudc-ldap-cleanup-record-filtering-addresses (record) "Clean up RECORD to make it suitable for EUDC. @@ -104,7 +104,7 @@ multiple addresses." (value (cdr field))) (when (and clean-up-addresses (memq name '(postaladdress registeredaddress))) - (setq value (mapcar 'eudc-filter-$ value))) + (setq value (mapcar #'eudc-filter-$ value))) (if (eq name 'mail) (setq mail-addresses (append mail-addresses value)) (push (cons name (if (cdr value) @@ -126,9 +126,9 @@ RETURN-ATTRS is a list of attributes to return, defaulting to (let ((result (ldap-search (eudc-ldap-format-query-as-rfc1558 query) eudc-server (if (listp return-attrs) - (mapcar 'symbol-name return-attrs)))) + (mapcar #'symbol-name return-attrs)))) final-result) - (setq result (mapcar 'eudc-ldap-cleanup-record-filtering-addresses result)) + (setq result (mapcar #'eudc-ldap-cleanup-record-filtering-addresses result)) (if (and eudc-strict-return-matches return-attrs @@ -154,7 +154,7 @@ attribute names are returned. Default to `person'." (let ((ldap-host-parameters-alist (list (cons eudc-server '(scope subtree sizelimit 1))))) - (mapcar 'eudc-ldap-cleanup-record-filtering-addresses + (mapcar #'eudc-ldap-cleanup-record-filtering-addresses (ldap-search (eudc-ldap-format-query-as-rfc1558 (list (cons "objectclass" |