Import kerberos detection changes, ldapmodify(1) update, and

"disallow bind_anon" fix from devel.

diff --git a/CHANGES b/CHANGES
index 03af2d0b3be8f9004919a0b61150ec843b8e1ca2..889b760343fcaef65e21e2794d7287d012a12cf6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,12 +3,18 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.X Engineering
        Fixed clients & -lldap KBIND (ITS#717)
        Fixed clients/tools -R handling
+       Fixed ldappasswd -A -S crash (ITS#714)
+       Fixed ldappasswd user argument usage
+       Fixed slapd disallow bind_anon (ITS#721)
        Fixed slapd IPv6 issues (ITS#716)
        Fixed slapd MIT KPASSWD Compatibility (ITS#715)
        Fixed slapd time syntax routines (ITS#713)
-       Fixed ldappasswd -A -S crash (ITS#714)
-       Fixed ldappasswd user argument usage and man page
-       Fixed ldapmodify man page
+       Build Environment
+               Fixed Kerberos detection (ITS#717)
+       Documentation
+               Fixed ldappasswd(1) user argument usage
+               Fixed ldapmodify(1) (ITS#719)
+               Updated release documents (ITS#720)
 
 OpenLDAP 2.0.1 Release
        Fixed StartTLS & ldaps:// client SDK

diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index afdaa0fa093805fcd97867e05b64ee0bddfcaa7d..3f54b15fabf155398ccd46344c7a8d28869485ff 100644 (file)
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
@@ -9,8 +9,6 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BR \-a ]
 [\c
-.BR \-b ]
-[\c
 .BR \-c ]
 [\c
 .BR \-C ]
@@ -63,8 +61,6 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 .LP
 .B ldapadd
 [\c
-.BR \-b ]
-[\c
 .BR \-c ]
 [\c
 .BR \-C ]
@@ -95,12 +91,16 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BI \-P \ 2\fR\||\|\fI3\fR]
 [\c
-.BR \-E[E] ]
+.BR \-O \ security-properties ]
 [\c
-.BR \-I[I] ]
+.BR \-I ]
+[\c
+.BR \-Q ]
 [\c
 .BI \-U \ username\fR]
 [\c
+.BR \-x ]
+[\c
 .BI \-X \ authzid\fR]
 [\c
 .BI \-Y \ mech\fR]
@@ -133,11 +133,6 @@ is to modify existing entries.  If invoked as
 .BR ldapadd ,
 this flag is always set.
 .TP
-.B \-b
-Assume that any values that start with a `/' are binary values and that
-the actual value is in a file whose path is specified in the place where
-values normally appear.
-.TP
 .B \-C
 Automatically chase referrals.
 .TP
@@ -302,7 +297,7 @@ exists and has the contents:
 the command:
 .LP
 .nf
-    ldapmodify -b -r -f /tmp/entrymods
+    ldapmodify -r -f /tmp/entrymods
 .fi
 .LP
 will replace the contents of the "Modify Me" entry's

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 69cd36c6f3aa7b65857e841c0cd0877671435ed4..df11b2df47d92414b8ee44f3acad629fed534ae1 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -511,6 +511,9 @@ read_config( const char *fname )
                                if( strcasecmp( cargv[i], "bind_v2" ) == 0 ) {
                                        disallows |= SLAP_DISALLOW_BIND_V2;
 
+                               } else if( strcasecmp( cargv[i], "bind_anon" ) == 0 ) {
+                                       disallows |= SLAP_DISALLOW_BIND_ANON;
+
                                } else if( strcasecmp( cargv[i], "bind_anon_cred" ) == 0 ) {
                                        disallows |= SLAP_DISALLOW_BIND_ANON_CRED;