X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=doc%2Fdevel%2Fargs;h=595e2a81b4b9a437607a90be7126336e9d5e7634;hb=3b71ba0f15ba7d774276292c04ef078448d47fdf;hp=c13185c0fe3e74c0ca939aeae721964e7806df48;hpb=54f1ebaffff58f2e40a6fa5d2f145630259a1bc1;p=openldap

diff --git a/doc/devel/args b/doc/devel/args
index c13185c0fe..595e2a81b4 100644
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -1,9 +1,9 @@
 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-ldapdelete         DE   I K M  P    U WXYZ  cd f h  k  n p     vw
-ldapmodify         DEF  I K M  P    U WXYZabcd f h  k  n p r t vw
-ldapmodrdn         DE   I K M  P    U WXYZ  cd f h  k  n p rs  vw
-ldappasswd      A  DE   I         S U WXYZa  d   h          s  vw    
-ldapsearch      AB DEF  I KLM  P RSTUVWXYZab d f h  kl n p  stuvw  z
+ldapdelete        CD    I K M OPQR  U WXYZ  cd f h  k  n p     vwx
+ldapmodify        CD F  I K M OPQR  U WXYZabcd f h  k  n p r t vwx
+ldapmodrdn        CD    I K M OPQR  U WXYZ  cd f h  k  n p rs  vwx
+ldappasswd      A CD    I     O QRS U WXYZa  d   h          s  vwx   
+ldapsearch      A CD    I KLM OPQRSTUVWXYZab*d f h  kl n p  stuvwx z
 
 Other Clients   ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
 fax500                                         f h    m
@@ -16,8 +16,12 @@ rp500                                     ab d f                 x z
 ud                 D                 V      cd f     l  p   s uv
 
 
+* reserved
+	EGHIJNOegijmoqy
+
 * General flags:
-	-D bind DN
+	-C Chase Referrals
+	-D Bind DN
 	-P protocol version
 	-W prompt for bind password
 	-d debug
@@ -25,24 +29,29 @@ ud                 D                 V      cd f     l  p   s uv
 	-n no-op
 	-p port
 	-v verbose
-	-w bind password
+	-w Bind password
+
 
 * LDAPv3 Only 
-	-M ManageDSAIT
+	-x simple bind (not recommended, excepting for anonymous access)
 
+	-M ManageDSAIT
 	-Z StartTLS
-	-C Certificate (reserved)
 
-	-I SASL Intergity
-	-E SASL Privacy (encryption)
-	-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
 
+* LDAPv2+ Only (DEPRECATED)
 	-K LDAPv2 Kerberos Bind (Step 1 only)
 	-k LDAPv2 Kerberos Bind
 
 
+---
 $OpenLDAP$