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

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

Support new-style LDAP URIs in ldap-search-internal
* net/ldap.el (ldap-search-internal): Support new-style LDAP URIs.
0dee0700 · Thomas Fitzsimmons · 090cbf9b · 0dee0700 · 0dee0700
Commit 0dee0700 authored Nov 13, 2014 by Thomas Fitzsimmons
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/net/ldap.el lisp/net/ldap.el +7 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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

--- 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"))))