Commit 6862a184 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#4371, #4619, #4647 updates from HEAD

parent 4aba5e62
......@@ -13,7 +13,11 @@ ldapsearch \- LDAP search tool
[\c
.BR \-v ]
[\c
.BR \-t ]
.BR \-t[t] ]
[\c
.BI \-T \ path\fR]
[\c
.BI \-F \ prefix\fR]
[\c
.BR \-A ]
[\c
......@@ -21,10 +25,14 @@ ldapsearch \- LDAP search tool
[\c
.BR \-M[M] ]
[\c
.BI \-S \ attribute\fR]
[\c
.BI \-d \ debuglevel\fR]
[\c
.BI \-f \ file\fR]
[\c
.BR \-x ]
[\c
.BI \-D \ binddn\fR]
[\c
.BR \-W ]
......@@ -39,14 +47,18 @@ ldapsearch \- LDAP search tool
[\c
.BI \-p \ ldapport\fR]
[\c
.BI \-P \ 2\fR\||\|\fI3\fR]
[\c
.BI \-b \ searchbase\fR]
[\c
.BI \-s \ base\fR\||\|\fIone\fR\||\|\fIsub\fR\||\|\fIchildren\fR]
[\c
.BI \-a \ never\fR\||\|\fIalways\fR\||\|\fIsearch\fR\||\|\fIfind\fR]
[\c
.BI \-P \ 2\fR\||\|\fI3\fR]
[\c
.BR \-e \ [!]ext[=extparam]]
[\c
.BR \-E \ [!]ext[=extparam]]
[\c
.BI \-l \ timelimit\fR]
[\c
.BI \-z \ sizelimit\fR]
......@@ -61,8 +73,6 @@ ldapsearch \- LDAP search tool
[\c
.BI \-R \ realm\fR]
[\c
.BR \-x ]
[\c
.BI \-X \ authzid\fR]
[\c
.BI \-Y \ mech\fR]
......@@ -74,7 +84,7 @@ ldapsearch \- LDAP search tool
.SH DESCRIPTION
.I ldapsearch
is a shell-accessible interface to the
.BR ldap_search (3)
.BR ldap_search_ext (3)
library call.
.LP
.B ldapsearch
......@@ -103,10 +113,19 @@ in the output.
.B \-v
Run in verbose mode, with many diagnostics written to standard output.
.TP
.B \-t
Write retrieved non-printable values to a set of temporary files. This
is useful for dealing with values containing non-character data such as
jpegPhoto or audio.
.B \-t[t]
A single -t writes retrieved non-printable values to a set of temporary
files. This is useful for dealing with values containing non-character
data such as jpegPhoto or audio. A second -t writes all retrieved values to
files.
.TP
.BI \-T \ path
Write temporary files to directory specified by \fIpath\fP (default:
/var/tmp/)
.TP
.BI \-F \ prefix
URL prefix for temporary files. Default is file://\fIpath\fP/ where
\fIpath\fP is /var/tmp/ or specified with -T.
.TP
.B \-A
Retrieve attributes only (no values). This is useful when you just want to
......@@ -146,9 +165,13 @@ must be compiled with LDAP_DEBUG defined for this option to have any effect.
.BI \-f \ file
Read a series of lines from \fIfile\fP, performing one LDAP search for
each line. In this case, the \fIfilter\fP given on the command line
is treated as a pattern where the first occurrence of \fB%s\fP is
replaced with a line from \fIfile\fP. If \fIfile\fP is a single \fI-\fP
character, then the lines are read from standard input.
is treated as a pattern where the first and only occurrence of \fB%s\fP
is replaced with a line from \fIfile\fP. Any other occurence of the
the \fB%\fP character in the pattern will be regarded as an error.
Where it is desired that the search filter include a \fB%\fP character,
the character should be encoded as \fB\\25\fP (see RFC 4515).
If \fIfile\fP is a single
\fI-\fP character, then the lines are read from standard input.
.TP
.B \-x
Use simple authentication instead of SASL.
......@@ -212,6 +235,35 @@ base object for the search. The default is to never dereference aliases.
.BI \-P \ 2\fR\||\|\fI3
Specify the LDAP protocol version to use.
.TP
.B \-e \fI[!]ext[=extparam]\fP
.TP
.B \-E \fI[!]ext[=extparam]\fP
Specify general extensions with -e and search extensions with -E.
\'!\' indicates criticality.
General extensions:
.nf
[!]assert=<filter> (an RFC 2254 Filter)
[!]authzid=<authzid> ("dn:<dn>" or "u:<user>")
[!]manageDSAit
[!]noop
ppolicy
[!]postread[=<attrs>] (a comma-separated attribute list)
[!]preread[=<attrs>] (a comma-separated attribute list)
abandon, cancel (SIGINT sends abandon/cancel; not really controls)
.fi
Search extensions:
.nf
[!]domainScope (domain scope)
[!]mv=<filter> (matched values filter)
[!]pr=<size>[/prompt|noprompt] (paged results/prompt)
[!]subentries[=true|false] (subentries)
[!]sync=ro[/<cookie>] (LDAP Sync refreshOnly)
rp[/<cookie>][/<slimit>] (LDAP Sync refreshAndPersist)
.fi
.TP
.BI \-l \ timelimit
wait at most \fItimelimit\fP seconds for a search to complete.
A timelimit of
......@@ -396,11 +448,9 @@ a diagnostic message being written to standard error.
.BR ldap.conf (5),
.BR ldif (5),
.BR ldap (3),
.BR ldap_search (3)
.BR ldap_search_ext (3),
.BR ldap_sort (3)
.SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS
.B OpenLDAP
is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
.B OpenLDAP
is derived from University of Michigan LDAP 3.3 Release.
.so ../Project
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment