aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-10-25 08:41:23 -0400
committerStefan Monnier2012-10-25 08:41:23 -0400
commitfb5b947504a34cd19aee4cddf308927cc1a90100 (patch)
tree2af14ca21c743549f24f3d02906fdf908354cfde
parenta7723be6dd55da926ade554df4f4fab86c094835 (diff)
downloademacs-fb5b947504a34cd19aee4cddf308927cc1a90100.tar.gz
emacs-fb5b947504a34cd19aee4cddf308927cc1a90100.zip
* lisp/net/ldap.el (ldap-search-internal): The official ldif format starts
with a "version: 1" header. Fixes: debbugs:12724
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/net/ldap.el1
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb19e10b9ae..0c78ea4038e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-10-25 Stefan Monnier <monnier@iro.umontreal.ca> 12012-10-25 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * net/ldap.el (ldap-search-internal): The official ldif format starts
4 with a "version: 1" header (bug#12724).
5
3 * emacs-lisp/package.el (package-installed-p): Warn if not ready 6 * emacs-lisp/package.el (package-installed-p): Warn if not ready
4 (bug#12721). 7 (bug#12721).
5 8
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."
604 ;; Skip error message when retrieving attribute list 604 ;; Skip error message when retrieving attribute list
605 (if (looking-at "Size limit exceeded") 605 (if (looking-at "Size limit exceeded")
606 (forward-line 1)) 606 (forward-line 1))
607 (if (looking-at "version:") (forward-line 1)) ;bug#12724.
607 (while (progn 608 (while (progn
608 (skip-chars-forward " \t\n") 609 (skip-chars-forward " \t\n")
609 (not (eobp))) 610 (not (eobp)))