(ldap-search-internal): Handle file URLs with drive

letters on DOS/Windows.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86b8eb8bb69c9f52651b41fcb72c54c803316b8b..141b28ba9e6ab442bcc2e9319682d7d8a82bcb4f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-11  Jason Rumney  <jasonr@gnu.org>
+
+       * net/ldap.el (ldap-search-internal): Handle file URLs with drive
+       letters on DOS/Windows.
+
 2004-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * server.el (server-name): New var.

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index d1a580f9c5400cdd073f05e39fc322439285b488..93802d5744a93c67ee8944ba3e3f4b00fb2b3713 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -582,6 +582,11 @@ an alist of attribute/value pairs."
          (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
            (setq name (match-string 1)
                  value (match-string 3))
+            ;; Need to handle file:///D:/... as generated by OpenLDAP
+            ;; on DOS/Windows as local files.
+            (if (and (memq system-type '(windows-nt ms-dos))
+                     (eq (string-match "/\\(.:.*\\)$" value) 0))
+                (setq value (match-string 1 value)))
            ;; Do not try to open non-existent files
            (if (equal value "")
                (setq value " ")