sync with HEAD

doc/devel/args

 Tools           ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-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
+ldapcompare		 * DE *HI*K M*OPQR  UVWXYZ   de *h**k *n*p*    vwx z
+ldapdelete       *CDE *HI*K M*OPQR  UVWXYZ  cdef*h**k *n*p*    vwxy
+ldapmodify       *CDEF*HI*K M*OPQRS UVWXYZabcdef*h**k *n*p*r t vwxy
+ldapmodrdn       *CDE *HI*K M*OPQR  UVWXYZ  cdef*h**k *n*p*rs  vwxy
+ldappasswd      A*CDE *HI*   *O QRS UVWXYZa  de *h**  * * * s  vwxy  
+ldapsearch      A*CDE *HI*KLM*OPQRSTUVWXYZab*def*h**kl*n*p* stuvwxyz
+ldapwhoami		 * DE *HI*   *O QR  UVWXYZ   def*h**  *n*p*    vwx  
 
 
 * reserved
@@ -24,6 +25,8 @@ ldapwhoami
 	-n no-op
 	-p port
 	-v verbose
+	-V version
+	-x simple bind
 	-y Bind password-file
 	-w Bind password
 	-4 IPv4 only

doc/devel/todo

@@ -33,6 +33,7 @@ Large projects
 Localize slapd
 Implement X.500 administrative models (e.g. subentries, etc.)
 Implement LDAP component matching
+Implement LDAP sorted search results control
 
 
 Medium projects
@@ -50,7 +51,6 @@ Small projects
 Add dumpasn1 logging support
 Add tests to test suite (ACI, moddn, manageDSAit, etc.)
 Convert utfconv.txt into man page(s).
-Implement -V version options
 Recode linked-list structs to use <ldap_queue.h> macros
 Update any manual page