Sync with HEAD

doc/devel/args

 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-ldapdelete       *CDE *HI*K M*OPQR  U*WXYZ  cdef*h**k *n*p*    vwx*
-ldapmodify       *CDEF*HI*K M*OPQRS U*WXYZabcdef*h**k *n*p*r t vwx*
-ldapmodrdn       *CDE *HI*K M*OPQR  U*WXYZ  cdef*h**k *n*p*rs  vwx*
-ldappasswd      A*CDE *HI*   *O QRS U*WXYZa  de *h**  * * * s  vwx*  
-ldapsearch      A*CDE *HI*KLM*OPQRSTU*WXYZab*def*h**kl*n*p* stuvwx*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                 *      cd f     l  p   s uv
+ldapdelete       *CDE *HI*K M*OPQR  U*WXYZ  cdef*h**k *n*p*    vwxy
+ldapmodify       *CDEF*HI*K M*OPQRS U*WXYZabcdef*h**k *n*p*r t vwxy
+ldapmodrdn       *CDE *HI*K M*OPQR  U*WXYZ  cdef*h**k *n*p*rs  vwxy
+ldappasswd      A*CDE *HI*   *O QRS U*WXYZa  de *h**  * * * s  vwxy  
+ldapsearch      A*CDE *HI*KLM*OPQRSTU*WXYZab*def*h**kl*n*p* stuvwxyz
+ldapwhoami
 
 
 * reserved
@@ -33,6 +24,7 @@ ud                 D                 *      cd f     l  p   s uv
 	-n no-op
 	-p port
 	-v verbose
+	-y Bind password-file
 	-w Bind password
 	-4 IPv4 only
 	-6 IPv6 only