X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=doc%2Fdevel%2Fargs;h=271eed951c6f8d0ee4c5f7688ebf7b69b436e0f5;hb=f9797d3b914f8e8f83454ca99c7e8beb218ba566;hp=5c2cad4945b341583840b96e880c4b6e4043d7ee;hpb=5fc22599e2e875c9620b63fbf465273fba3c378f;p=openldap

diff --git a/doc/devel/args b/doc/devel/args
index 5c2cad4945..271eed951c 100644
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -1,50 +1,63 @@
 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-ldapdelete        CD      K M OP *  U WXYZ  cd f h  k  n p     vw
-ldapmodify        CD F    K M OP *  U WXYZabcd f h  k  n p r t vw
-ldapmodrdn        CD      K M OP *  U WXYZ  cd f h  k  n p rs  vw
-ldappasswd      A CD          O  *S U WXYZa  d   h          s  vw    
-ldapsearch      A CD      KLM OP *STUVWXYZab*d f h  kl n p  stuvw  z
-
-Other Clients   ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-fax500                                         f h    m
-finger                                      c  f  i  l  p    t   x
-go500                   I                  bcd f     l  p    t   x
-go500gw                 I      P          a cd f h   l  p    t   x
-mail500           C                          d f h   lm        v
-rcpt500                             U     abc  f h   l  p   st     z
-rp500                                     ab d f                 x z
-ud                 D                 V      cd f     l  p   s uv
+ldapcompare      * DE**HI** MNOPQR  UVWXYZ   de *h*** *nop*    vwxyz
+ldapdelete       *CDE**HI** MNOPQR  UVWXYZ  cdef*h*** *nop*    vwxyz
+ldapexop         * D **HI**  NO QR  UVWXYZ   de *h*** *nop     vwxy
+ldapmodify       *CDE**HI** MNOPQRS UVWXYZabcde *h*** *nop*r t vwxy
+ldapmodrdn       *CDE**HI** MNOPQR  UVWXYZ  cdef*h*** *nop*rs  vwxy
+ldappasswd      A*CDE**HI**  NO QRS UVWXYZa  def*h*** * o * s  vwxy  
+ldapsearch      A*CDE**HI**LMNOPQRSTUVWXYZab def*h***l*nop* stuvwxyz
+ldapurl          *  E**H **       S       ab   f*h*** *  p* s
+ldapwhoami       * DE**HI**  NO QR  UVWXYZ   def*h*** *nop*    vwxy 
 
 
 * reserved
-	EGHIJNOegijmoqxy
+	BFGJgijmq01235789
 
 * General flags:
 	-C Chase Referrals
-	-D bind DN
+	-D Bind DN
+	-E Tool-specific Extensions	(e.g., -E <[!]oid[=options]>*)
+	-e General Extensions		(e.g., -e <[!]oid[=options]>*)
+	-f file
+	-H URI
 	-P protocol version
-	-R old don't chase referrals
+	-V version information
 	-W prompt for bind password
 	-d debug
 	-h host
 	-n no-op
+	-N no (SASLprep) normalization of simple bind password
+	-o general connection options (currently nettimeout only)
 	-p port
 	-v verbose
-	-w bind password
+	-V version
+	-x simple bind
+	-y Bind password-file
+	-w Bind password
+
+Not used
+	-4 IPv4 only
+	-6 IPv6 only
+
 
 * LDAPv3 Only 
 	-M ManageDSAIT
-
 	-Z StartTLS
 
-	-O SASL Security Options
-	-U SASL Authentication Identity (username)
-	-X SASL Authorization Identity
-	-Y SASL Mechanism
+	-Y SASL Mechanism (defaults to "best")
+	-R SASL Realm (defaults to empty)
+	-O SASL Security Options (defaults to "noanonymous,noplain")
+	-U SASL Authentication Identity (defaults to USER)
+	-X SASL Authorization Identity (defaults to empty)
+
+	-I SASL interactive mode (default: automatic)
+	-Q SASL quiet mode (default: automatic)
+
+
+* LDAPv2+ Only (REMOVED)
+	-K LDAPv2 Kerberos Bind (Step 1 only)
+	-k LDAPv2 Kerberos Bind
 
-* LDAPv2+ Only
-	-K LDAPv2 Kerberos Bind (Step 1 only) (depecated)
-	-k LDAPv2 Kerberos Bind (depecated)
-	-R Don't chase referrals (depecated)
 
+---
 $OpenLDAP$