Support new-style LDAP URIs in ldap-search-internal

* net/ldap.el (ldap-search-internal): Support new-style LDAP URIs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a68f33044dfe9879ad10b8e10917c5244c51a69..831e3b03a76575894e27af1f88e1d66e7e14a443 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-13  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+       * net/ldap.el (ldap-search-internal): Support new-style LDAP URIs.
+
 2014-11-13  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
        * net/eudc-vars.el (eudc-server): Adjust docstring to mention

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 10ce7a78d358bf18d74bbfe9af9041f2ed8148b2..2b5b2fb89a5256a4cf85df63b8891fe5780f7a27 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -559,7 +559,13 @@ an alist of attribute/value pairs."
       (erase-buffer)
       (if (and host
               (not (equal "" host)))
-         (setq arglist (nconc arglist (list (format "-h%s" host)))))
+         (setq arglist (nconc arglist
+                              (list (format
+                                     ;; Use -H if host is a new-style LDAP URI.
+                                     (if (string-match "^[a-zA-Z]+://" host)
+                                         "-H%s"
+                                       "-h%s")
+                                     host)))))
       (if (and attrsonly
               (not (equal "" attrsonly)))
          (setq arglist (nconc arglist (list "-A"))))