Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 427-436)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 134-136)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110

1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 2a63615a602..18b96a7cce1 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -490,9 +490,11 @@ 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).
+  `auth' is one of the symbols `simple', `krbv41' or `krbv42'
   `passwd' is the password to use for simple authentication.
   `deref' is one of the symbols `never', `always', `search' or `find'.
   `timelimit' is the timeout limit for the connection in seconds.
@@ -512,6 +514,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 +544,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)))))