X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fsmime-ldap.el;h=25d3bd8bfcb55c6ba39d279a23ab1951a09437bf;hb=0007de6d40db139c025a8b2cba9ef04ee4837608;hp=0786d357544254d074a9cce1ee3e674f7b18aa6f;hpb=ec1a89e3bff9030bfc40c948c1b48b7c04d44857;p=gnus

diff --git a/lisp/smime-ldap.el b/lisp/smime-ldap.el
index 0786d3575..25d3bd8bf 100644
--- a/lisp/smime-ldap.el
+++ b/lisp/smime-ldap.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -53,28 +53,8 @@ Additional search parameters can be specified through
   ;; for XEmacs
   (if (fboundp 'ldap-search-entries)
       (ldap-search-entries filter host attributes attrsonly)
-    ;; for Emacs 22
-    (if (>= emacs-major-version 22)
-	(cdr (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))))
-	(cdr (if ldap-ignore-attribute-codings
-		 result
-	       (mapcar (function
-			(lambda (record)
-			  (mapcar 'ldap-decode-attribute record)))
-		       result)))))))
+    ;; for Emacs
+    (cdr (ldap-search filter host attributes attrsonly))))
 
 (defun smime-ldap-search-internal (search-plist)
   "Perform a search on a LDAP server.
@@ -120,8 +100,7 @@ an alist of attribute/value pairs."
 	    (equal "" filter))
 	(error "No search filter"))
     (setq filter (cons filter attributes))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (if (and host
 	       (not (equal "" host)))
@@ -181,8 +160,7 @@ an alist of attribute/value pairs."
 				     "\\(<[\t ]*file://\\)?\\(.*\\)$"))
 	    (setq name (match-string 1)
 		  value (match-string 4))
-	    (save-excursion
-	      (set-buffer bufval)
+	    (with-current-buffer bufval
 	      (erase-buffer)
 	      (insert-file-contents-literally value)
 	      (delete-file value)
@@ -202,5 +180,4 @@ an alist of attribute/value pairs."
 
 (provide 'smime-ldap)
 
-;; arch-tag: 87e6bc44-21fc-4e9b-a89b-f55f031f78f8
 ;;; smime-ldap.el ends here