# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1157663776 0
# Node ID 891321627212a8ecebd54422d689c2ddd50ba7ac
# Parent  155209293baf550a6f4810dc2e16c5432bd09891
	* net/ldap.el (ldap-search-internal): Handle `auth' key.

diff -r 155209293baf -r 891321627212 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 07 20:58:09 2006 +0000
+++ b/lisp/ChangeLog	Thu Sep 07 21:16:16 2006 +0000
@@ -1,3 +1,7 @@
+2006-09-07  Toby Allsopp  <Toby.Allsopp@navman.com>  (tiny change)
+
+	* net/ldap.el (ldap-search-internal): Handle `auth' key.
+
 2006-09-07  Magnus Henoch <mange@freemail.hu>
 
 	* net/rcirc.el (rcirc-activity-string): Don't quote value in case
diff -r 155209293baf -r 891321627212 lisp/net/ldap.el
--- a/lisp/net/ldap.el	Thu Sep 07 20:58:09 2006 +0000
+++ b/lisp/net/ldap.el	Thu Sep 07 21:16:16 2006 +0000
@@ -490,6 +490,7 @@
 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 @@
 		  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 @@
       (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)))))