===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ldap/ldap.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/ldap/ldap.1	2018/06/26 09:47:20	1.6
--- src/usr.bin/ldap/ldap.1	2018/07/03 10:10:09	1.7
***************
*** 1,4 ****
! .\" $OpenBSD: ldap.1,v 1.6 2018/06/26 09:47:20 reyk Exp $
  .\"
  .\" Copyright (c) 2018 Reyk Floeter <reyk@openbsd.org>
  .\"
--- 1,4 ----
! .\" $OpenBSD: ldap.1,v 1.7 2018/07/03 10:10:09 jmc Exp $
  .\"
  .\" Copyright (c) 2018 Reyk Floeter <reyk@openbsd.org>
  .\"
***************
*** 14,20 ****
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: June 26 2018 $
  .Dt LDAP 1
  .Os
  .Sh NAME
--- 14,20 ----
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: July 3 2018 $
  .Dt LDAP 1
  .Os
  .Sh NAME
***************
*** 22,28 ****
  .Nd simple LDAP client
  .Sh SYNOPSIS
  .Nm ldap
! .Ar command
  .Op Fl LvWxZ
  .Op Fl b Ar basedn
  .Op Fl c Ar CAfile
--- 22,28 ----
  .Nd simple LDAP client
  .Sh SYNOPSIS
  .Nm ldap
! .Cm search
  .Op Fl LvWxZ
  .Op Fl b Ar basedn
  .Op Fl c Ar CAfile
***************
*** 33,49 ****
  .Op Fl w Ar secret
  .Op Fl y Ar secretfile
  .Op Fl z Ar sizelimit
! .Op Ar arguments ...
  .Sh DESCRIPTION
  The
  .Nm
  program is a simple LDAP client program.
  It queries an LDAP server to perform a command and outputs the results
  in the LDAP Data Interchange Format (LDIF).
- .Pp
- The command is as follows:
  .Bl -tag -width Ds
! .It Cm search Ar options Oo Ar filter Oc Op Ar attribute ...
  Perform a directory search request.
  The optional
  .Ar filter
--- 33,48 ----
  .Op Fl w Ar secret
  .Op Fl y Ar secretfile
  .Op Fl z Ar sizelimit
! .Op Ar filter
! .Op Ar attributes ...
  .Sh DESCRIPTION
  The
  .Nm
  program is a simple LDAP client program.
  It queries an LDAP server to perform a command and outputs the results
  in the LDAP Data Interchange Format (LDIF).
  .Bl -tag -width Ds
! .It Cm search Ar options Oo Ar filter Oc Op Ar attributes ...
  Perform a directory search request.
  The optional
  .Ar filter
***************
*** 82,96 ****
  .Sm off
  .Op Ar protocol No ://
  .Ar host Op : Ar port
! .Oo / basedn
! .Oo ? Op Ar attribute , ...
! .Oo ? Op Ar scope
! .Op ? Op Ar filter
  .Oc
- .Oc
- .Oc
  .Sm on
  .Pp
  The following protocols are supported:
  .Pp
  .Bl -tag -width "ldap+tls" -compact
--- 81,107 ----
  .Sm off
  .Op Ar protocol No ://
  .Ar host Op : Ar port
! .Oo
! .Li / Ar basedn
! .Li ?\& Ar attribute , ...
! .Li ?\& Ar scope
! .Li ?\& Ar filter
  .Oc
  .Sm on
  .Pp
+ The default is
+ .Ar ldap://localhost:389/ .
+ Each of
+ .Ar basedn , attribute , scope
+ and
+ .Ar filter
+ may be omitted,
+ but the preceding
+ .Sq /
+ or
+ .Sq ?\&
+ is required if a subsequent field is non-empty.
+ .Pp
  The following protocols are supported:
  .Pp
  .Bl -tag -width "ldap+tls" -compact
***************
*** 112,120 ****
  for
  .Pa /var/run/ldapi .
  .El
- .Pp
- The default is
- .Ar ldap://localhost:389/ .
  .It Fl L
  Output the directory search result in a standards-compliant version of
  the LDAP Data Interchange Format (LDIF).
--- 123,128 ----