From: Pavel Janík <Pavel@Janik.cz>
Date: Sun, 6 Jan 2002 17:59:09 +0000 (+0000)
Subject: (ldap-search-internal): Skip error message from ldapsearch.  Allow listing
X-Git-Tag: ttn-vms-21-2-B4~17279
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4ac0cdbf58a0dc9392164089aaa14c137ae4264;p=emacs.git

(ldap-search-internal): Skip error message from ldapsearch.  Allow listing
attribute names only.  Do not open non-existent files.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e40d0303778..06f72325d71 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2002-01-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+	* net/ldap.el (ldap-search-internal): Skip error message from
+	ldapsearch.  Allow listing attribute names only.  Do not open
+	non-existent files.
+
+	* net/eudcb-ldap.el (eudc-ldap-get-field-list): Do not try to
+	call non-existent function.
+
 	* net/eudc.el (top-level): Revert previous change.
 
 	* net/net-utils.el (nslookup-font-lock-keywords): Defvar font-lock
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 2d1f9a0a399..410af2ddc9e 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -570,6 +570,9 @@ an alist of attribute/value pairs."
       (if (looking-at "usage")
 	  (error "Incorrect ldapsearch invocation")
 	(message "Parsing results... ")
+	;; Skip error message when retrieving attribute list
+	(if (looking-at "Size limit exceeded")
+	    (forward-line 1))
 	(while (progn
 		 (skip-chars-forward " \t\n")
 		 (not (eobp)))
@@ -580,13 +583,16 @@ an alist of attribute/value pairs."
 	  (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
 	    (setq name (match-string 1)
 		  value (match-string 3))
-	    (save-excursion
-	      (set-buffer bufval)
-	      (erase-buffer)
-	      (set-buffer-multibyte nil)
-	      (insert-file-contents-literally value)
-	      (delete-file value)
-	      (setq value (buffer-string)))
+	    ;; Do not try to open non-existent files
+	    (if (equal value "")
+		(setq value " ")
+	      (save-excursion
+		(set-buffer bufval)
+		(erase-buffer)
+		(set-buffer-multibyte nil)
+		(insert-file-contents-literally value)
+		(delete-file value)
+		(setq value (buffer-string))))
 	    (setq record (cons (list name value)
 			       record))
 	    (forward-line 1))