dd ManageDSAit discussion

[openldap] / doc / devel / args

diff --git a/doc/devel/args b/doc/devel/args
index 513e2fdea060d59a710040f5cee5ac1065d83e20..595e2a81b4b9a437607a90be7126336e9d5e7634 100644 (file)
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -1,9 +1,9 @@
 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-ldapdelete        CDE   I K M  P *  U WXYZ  cd f h  k  n p     vw
-ldapmodify        CDEF  I K M  P *  U WXYZabcd f h  k  n p r t vw
-ldapmodrdn        CDE   I K M  P *  U WXYZ  cd f h  k  n p rs  vw
-ldappasswd      A CDE   I        *S U WXYZa  d   h          s  vw    
-ldapsearch      A CDE   I KLM  P *STUVWXYZab*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
@@ -17,36 +17,41 @@ ud                 D                 V      cd f     l  p   s uv
 
 
 * reserved
-       GHJNOegijmoqxy
+       EGHIJNOegijmoqy
 
 * General flags:
        -C Chase Referrals
-       -D bind DN
+       -D Bind DN
        -P protocol version
-       -R old don't chase referrals
        -W prompt for bind password
        -d debug
        -h host
        -n no-op
        -p port
        -v verbose
-       -w bind password
-       -W prompt for bind password
+       -w Bind password
+
 
 * LDAPv3 Only 
-       -M ManageDSAIT
+       -x simple bind (not recommended, excepting for anonymous access)
 
+       -M ManageDSAIT
        -Z StartTLS
 
-       -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 (DEPRECATED)
+       -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$