Sync with HEAD

diff --git a/doc/devel/args b/doc/devel/args
index 276fccb1d2def8526227f63fa4ccfe647034a4d3..a9dd91ebf7fe6e3e23f15bde33df568130acd581 100644 (file)
--- a/doc/devel/args
+++ b/doc/devel/args
@@ -35,9 +35,6 @@ ldapwhoami             * DE**HI*   *O QR  UVWXYZ   def*h**  *n*p*    vwxy
 
 
 * LDAPv3 Only 
-       -x simple bind (not recommended excepting for
-               anonymous access, w/ -ZZ, or with ldaps://.
-
        -M ManageDSAIT
        -Z StartTLS
 

diff --git a/doc/devel/template.c b/doc/devel/template.c
new file mode 100644 (file)
index 0000000..28e028d
--- /dev/null
+++ b/doc/devel/template.c
@@ -0,0 +1,26 @@
+/* template.c -- example OpenLDAP source file */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright YEAR The OpenLDAP Foundation.
+ * Portions Copyright YEAR Secondary Rights Holder.
+ * Portions Copyright YEAR Another Rights Holder.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Additional (custom) notices (where necessary).
+ *  Please consult Kurt Zeilenga <kurt@openldap.org> before adding
+ *  additional notices.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Jane Doe for inclusion in
+ * OpenLDAP Software.  Additional significant contributors include:
+ *   John Doe
+ */

diff --git a/doc/devel/todo b/doc/devel/todo
index d15d5ec34b74d1579658aeddba84f601b8459cc2..66e71b7a44f637ae1f45d0c45dea546572d97265 100644 (file)
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -38,18 +38,19 @@ Implement LDAP sorted search results control
 
 Medium projects
 ---------------
+Add DSML capabilities to command line tools
 Implement authPassword (RFC 3112)
 Implement DIT Structure Rules and Name Forms
-Implement LDAP Assertion Control
 Implement LDAP Transactions extension
+Implement native support for simple SASL mechanisms (e.g. EXTERNAL and PLAIN)
 Redesign slapd memory allocation fault handling
 Localize tools
 
 
 Small projects
 --------------
-Add DSML capabilities to command line tools
 Add dumpasn1 logging support
+Implement LDAPprep and SASLprep
 Add tests to test suite
 Convert utfconv.txt into man page(s).
 Recode linked-list structs to use <ldap_queue.h> macros