From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 25 Oct 2012 12:41:23 +0000 (-0400)
Subject: * lisp/net/ldap.el (ldap-search-internal): The official ldif format starts
X-Git-Tag: emacs-24.2.90~209^2~74
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb5b947504a34cd19aee4cddf308927cc1a90100;p=emacs.git

* lisp/net/ldap.el (ldap-search-internal): The official ldif format starts
with a "version: 1" header.

Fixes: debbugs:12724
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb19e10b9ae..0c78ea4038e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* net/ldap.el (ldap-search-internal): The official ldif format starts
+	with a "version: 1" header (bug#12724).
+
 	* emacs-lisp/package.el (package-installed-p): Warn if not ready
 	(bug#12721).
 
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index eb696798b6f..6ef713de93d 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -604,6 +604,7 @@ an alist of attribute/value pairs."
 	;; Skip error message when retrieving attribute list
 	(if (looking-at "Size limit exceeded")
 	    (forward-line 1))
+        (if (looking-at "version:") (forward-line 1)) ;bug#12724.
 	(while (progn
 		 (skip-chars-forward " \t\n")
 		 (not (eobp)))