2001-08-06 SAITO Atsunori <sai@yedo.com>

	* wl-vars.el (wl-ldap-objectclass): New user option.

	* wl-address.el (wl-ldap-make-filter): Use it.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index d294883..bc6d785 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-06  SAITO Atsunori <sai@yedo.com>
+
+       * wl-vars.el (wl-ldap-objectclass): New user option.
+
+       * wl-address.el (wl-ldap-make-filter): Use it.
+
 2001-07-14  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-draft.el (wl-message-mail-p): Test resent-to: field.

diff --git a/wl/wl-address.el b/wl/wl-address.el
index 259ae2b..9d589f9 100644 (file)
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -104,7 +104,7 @@ If level 3 is required for uniqness with other candidates,
 (defun wl-ldap-make-filter (pat type-list)
   "Make RFC1558 quiery filter for PAT from ATTR-LIST.
 Each are \"OR\" combination, and PAT is beginning-match."
-  (concat "(&(objectclass=person)(|"
+  (concat "(&(objectclass=" wl-ldap-objectclass ")(|"
          (mapconcat (lambda (x) (format "(%s=%s*)" x pat)) ; fixed format
                     type-list
                     "")

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index d9869e7..d227c55 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -677,6 +677,11 @@ Default is for 'followup-to-me'."
   :type '(string :tag "Base")
   :group 'wl)
 
+(defcustom wl-ldap-objectclass "person"
+  "*LDAP objectclass."
+  :type 'string
+  :group 'wl)
+
 (defcustom wl-use-ldap nil
   "*If non-nil, use LDAP for address completion."
   :type 'boolean