Update ldappasswd binddn bug, man page and error reporting

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 2c9f5e868a0197996ee90fb66ad28fcc2d19b485..b0cdfb6dea4f8d95883831cfb412320d78be8b8e 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -533,7 +533,9 @@ main( int argc, char *argv[] )
 
        if (want_bindpw && passwd.bv_val == NULL ) {
                /* handle bind password */
-               fprintf( stderr, "Bind DN: %s\n", binddn );
+               if( binddn != NULL ) {
+                       fprintf( stderr, "Bind DN: %s\n", binddn );
+               }
                passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
                passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
        }

diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1
index 2d40106bc2ab46753823f7108282d9c9f4418122..b37e3df50340c38fa2f8c734472a2fdaeb82070e 100644 (file)
--- a/doc/man/man1/ldappasswd.1
+++ b/doc/man/man1/ldappasswd.1
@@ -13,7 +13,7 @@ ldappasswd \- change the password of an LDAP entry
 [\c
 .BR \-C ]
 [\c
-.BI \-D \ binddn\fR
+.BI \-D \ binddn\fR]
 [\c
 .BI \-d \ debuglevel\fR]
 [\c
@@ -86,8 +86,6 @@ Use simple authentication instead of SASL.
 .TP
 .BI \-D \ binddn
 Use the Distinguished Name \fIbinddn\fP to bind to the LDAP directory.
-This flag is not optional.  The user DN will be used if the
-bind DN is not provided.
 .TP
 .BI \-d \ debuglevel
 Set the LDAP debugging level to \fIdebuglevel\fP.

diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c
index f104252151fccf1e5b8374e12b740a203fb7b98d..2acb3d8532f61a3c0fdcfd246286fceecc641a07 100644 (file)
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -88,7 +88,7 @@ ldbm_back_exop_passwd(
 
        if( e == NULL ) {
                *text = "could not locate authorization entry";
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_NO_SUCH_OBJECT;
                goto done;
        }