Index: lisp/smime-ldap.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/smime-ldap.el,v
retrieving revision 7.3
diff -u -p -r7.3 smime-ldap.el
--- lisp/smime-ldap.el	15 Feb 2005 01:58:42 -0000	7.3
+++ lisp/smime-ldap.el	13 Apr 2005 12:44:06 -0000
@@ -35,10 +35,15 @@
 ;; smime.el changed to
 
 ;;   - (require 'smime-ldap)   =>   (require 'ldap)
-;;   - (smime-ldap-search ...) =>   (ldap-search ...)
+;;   - and add
+;;         (defalias 'smime-ldap-search
+;;           (if (fboundp 'ldap-search-entries)
+;;               'ldap-search-entries
+;;             'ldap-search))
 
 ;; If we are running in Emacs 22 or newer it just uses the build-in
-;; version of ldap-search.
+;; version of ldap-search and if we are running XEmacs it uses the
+;; build-in ldap-search-entries.
 
 ;;; Code:
 
@@ -57,26 +62,31 @@ its distinguished name WITHDN.
 Additional search parameters can be specified through
 `ldap-host-parameters-alist', which see."
   (interactive "sFilter:")
-  (if (>= emacs-major-version 22)
-      (ldap-search filter host attributes attrsonly)
-    (or host
-	(setq host ldap-default-host)
-	(error "No LDAP host specified"))
-    (let ((host-plist (cdr (assoc host ldap-host-parameters-alist)))
-	  result)
-      (setq result (smime-ldap-search-internal
-		    (append host-plist
-			    (list 'host host
-				  'filter filter
-				  'attributes attributes
-				  'attrsonly attrsonly
-				  'withdn withdn))))
-      (if ldap-ignore-attribute-codings
-	  result
-	(mapcar (function
-		 (lambda (record)
-		   (mapcar 'ldap-decode-attribute record)))
-		result)))))
+  ;; for XEmacs
+  (if (fboundp 'ldap-search-entries)
+      (ldap-search-entries filter host attributes attrsonly)
+    ;; for Emacs 22
+    (if (>= emacs-major-version 22)
+	(ldap-search filter host attributes attrsonly)
+      ;; for Emacs 21.x
+      (or host
+	  (setq host ldap-default-host)
+	  (error "No LDAP host specified"))
+      (let ((host-plist (cdr (assoc host ldap-host-parameters-alist)))
+	    result)
+	(setq result (smime-ldap-search-internal
+		      (append host-plist
+			      (list 'host host
+				    'filter filter
+				    'attributes attributes
+				    'attrsonly attrsonly
+				    'withdn withdn))))
+	(if ldap-ignore-attribute-codings
+	    result
+	  (mapcar (function
+		   (lambda (record)
+		     (mapcar 'ldap-decode-attribute record)))
+		  result))))))
 
 (defun smime-ldap-search-internal (search-plist)
   "Perform a search on a LDAP server.