From: Filipp Gunbin <fgunbin@fastmail.fm>
Date: Tue, 25 Oct 2022 14:59:33 +0000 (+0300)
Subject: Move required options out of ldap-ldapsearch-args
X-Git-Tag: emacs-29.0.90~1616^2~468
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e60246ab3cb7a3c40ca48d8ea9c107f00a6aea6;p=emacs.git

Move required options out of ldap-ldapsearch-args

* lisp/net/ldap.el (ldap-ldapsearch-args, ldap-search-internal): Move
"-LLL" and "-tt" options as they're required for the code to work
properly.
---

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index ccad8c4edb1..de553468b1c 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -156,7 +156,7 @@ Valid properties include:
   "The name of the ldapsearch command line program."
   :type '(string :tag "`ldapsearch' Program"))
 
-(defcustom ldap-ldapsearch-args '("-LLL" "-tt")
+(defcustom ldap-ldapsearch-args nil
   "A list of additional arguments to pass to `ldapsearch'."
   :type '(repeat :tag "`ldapsearch' Arguments"
 		 (string :tag "Argument")))
@@ -609,7 +609,8 @@ an alist of attribute/value pairs."
 	(sizelimit (plist-get search-plist 'sizelimit))
 	(withdn (plist-get search-plist 'withdn))
 	(numres 0)
-	arglist dn name value record result)
+        (arglist (list "-LLL" "-tt"))
+	dn name value record result)
     (if (or (null filter)
 	    (equal "" filter))
 	(error "No search filter"))