dd ManageDSAit discussion

[openldap] / doc / devel / args

diff --git a/doc/devel/args b/doc/devel/args
index ec1069de8a790ceb9126d9c3e1c3b62797fc3d5a..595e2a81b4b9a437607a90be7126336e9d5e7634 100644 (file)
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -1,9 +1,9 @@
 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-ldapdelete        CD      K M OP *  U WXYZ  cd f h  k  n p     vwx
-ldapmodify        CD F    K M OP *  U WXYZabcd f h  k  n p r t vwx
-ldapmodrdn        CD      K M OP *  U WXYZ  cd f h  k  n p rs  vwx
-ldappasswd      A CD          O  *S U WXYZa  d   h          s  vwx   
-ldapsearch      A CD      KLM OP *STUVWXYZab*d f h  kl n p  stuvwx 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
@@ -23,7 +23,6 @@ ud                 D                 V      cd f     l  p   s uv
        -C Chase Referrals
        -D Bind DN
        -P protocol version
-       -R deprecated (don't chase referrals)
        -W prompt for bind password
        -d debug
        -h host
@@ -31,21 +30,28 @@ ud                 D                 V      cd f     l  p   s uv
        -p port
        -v verbose
        -w Bind password
-       -x simple bind
+
 
 * LDAPv3 Only 
-       -M ManageDSAIT
+       -x simple bind (not recommended, excepting for anonymous access)
 
+       -M ManageDSAIT
        -Z StartTLS
 
-       -Y SASL Mechanism
-       -O SASL Security Options
-       -U SASL Authentication Identity (username)
-       -X SASL Authorization Identity
+       -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$