diff options
| author | Filipp Gunbin <fgunbin@fastmail.fm> | 2022-04-14 16:47:32 +0300 |
|---|---|---|
| committer | Filipp Gunbin <fgunbin@fastmail.fm> | 2022-04-14 16:52:01 +0300 |
| commit | 831314b08b8d48d181691c913c094ad98e735181 (patch) | |
| tree | 6de0099c4249292e292b7cdd3fb17feac9266c3c /lisp | |
| parent | 2a2f5530fa230e2b994be5683e63763833bb6a0a (diff) | |
| download | emacs-831314b08b8d48d181691c913c094ad98e735181.tar.gz emacs-831314b08b8d48d181691c913c094ad98e735181.tar.bz2 emacs-831314b08b8d48d181691c913c094ad98e735181.zip | |
ldap-search-internal cleanup
* lisp/net/ldap.el (ldap-ldapsearch-args): Change -LL to -LLL to
suppress ldif version output.
(ldap-search-internal): Remove skipping of version output. Remove
redundand ws skipping.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/ldap.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 94632821353..da45457891b 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -148,7 +148,7 @@ Valid properties include: "The name of the ldapsearch command line program." :type '(string :tag "`ldapsearch' Program")) -(defcustom ldap-ldapsearch-args '("-LL" "-tt") +(defcustom ldap-ldapsearch-args '("-LLL" "-tt") "A list of additional arguments to pass to `ldapsearch'." :type '(repeat :tag "`ldapsearch' Arguments" (string :tag "Argument"))) @@ -682,7 +682,7 @@ an alist of attribute/value pairs." (while (re-search-forward (concat "[\t\n\f]+ \\|" ldap-ldapsearch-password-prompt-regexp) nil t) - (replace-match "" nil nil)) + (replace-match "")) (goto-char (point-min)) (if (looking-at "usage") @@ -691,7 +691,6 @@ an alist of attribute/value pairs." ;; Skip error message when retrieving attribute list (if (looking-at "Size limit exceeded") (forward-line 1)) - (if (looking-at "version:") (forward-line 1)) ;bug#12724. (while (progn (skip-chars-forward " \t\n") (not (eobp))) @@ -724,7 +723,6 @@ an alist of attribute/value pairs." (record (push (nreverse record) result))) (setq record nil) - (skip-chars-forward " \t\n") (message "Parsing results... %d" numres) (setq numres (1+ numres))) (message "Parsing results... done") |