summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-08-12 18:36:15 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-08-12 18:36:15 +0000
commitd35a5141a520f29b29ba5e5e7f1f2e339a719b5d (patch)
tree71516dddcb7b3086173c3ba9d0317ea754fdf0b6
parent5e678cd1de5e96d713a63a9f3604e7cab242f94b (diff)
downloademacs-d35a5141a520f29b29ba5e5e7f1f2e339a719b5d.tar.gz
(ldap-search-internal): Tweak URL regexp.
-rw-r--r--lisp/net/ldap.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index d0bbe32c65a..bff7cf7180c 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -586,7 +586,9 @@ an alist of attribute/value pairs."
(end-of-line)
(point))))
(forward-line 1)
- (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)\\(.*\\)$")
+ (while (looking-at "^\\([A-Za-z][-A-Za-z0-9]*\
+\\|[0-9]+\\(?:\\.[0-9]+\\)*\\)\\(;[-A-Za-z0-9]+\\)*[=:\t ]+\
+\\(<[\t ]*file://\\)\\(.*\\)$")
(setq name (match-string 1)
value (match-string 4))
;; Need to handle file:///D:/... as generated by OpenLDAP