From 325537113d1223aa42e19f47e7687ab1458d16fa Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 7 Sep 2006 21:16:16 +0000 Subject: [PATCH] * net/ldap.el (ldap-search-internal): Handle `auth' key. --- lisp/ChangeLog | 4 ++++ lisp/net/ldap.el | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f3fc456116..646ceb9c2e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-09-07 Toby Allsopp (tiny change) + + * net/ldap.el (ldap-search-internal): Handle `auth' key. + 2006-09-07 Magnus Henoch * net/rcirc.el (rcirc-activity-string): Don't quote value in case diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 2a63615a602..029c9268d5f 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -490,6 +490,7 @@ to try to connect to. Each host name may optionally be of the form HOST:PORT. for each matching entry. If nil, return all available attributes. `attrsonly', if non-nil, indicates that only attributes are retrieved, not their associated values. + `auth' is one of the symbols `simple', `krbv41' or `krbv42'. `base' is the base for the search as described in RFC 1779. `scope' is one of the three symbols `sub', `base' or `one'. `binddn' is the distinguished name of the user to bind as (in RFC 1779 syntax). @@ -512,6 +513,7 @@ an alist of attribute/value pairs." ldap-default-base)) (scope (plist-get search-plist 'scope)) (binddn (plist-get search-plist 'binddn)) + (auth (plist-get search-plist 'auth)) (passwd (plist-get search-plist 'passwd)) (deref (plist-get search-plist 'deref)) (timelimit (plist-get search-plist 'timelimit)) @@ -541,6 +543,9 @@ an alist of attribute/value pairs." (if (and binddn (not (equal "" binddn))) (setq arglist (nconc arglist (list (format "-D%s" binddn))))) + (if (and auth + (equal 'simple auth)) + (setq arglist (nconc arglist (list "-x")))) (if (and passwd (not (equal "" passwd))) (setq arglist (nconc arglist (list (format "-w%s" passwd))))) -- 2.39.2