ITS#5753

diff --git a/CHANGES b/CHANGES
index 200ce4f00cf59b5b010e1ad62b552d46583eba1e..ce70cbde22a994c548eab0cfe0c8f7aa0d835686 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ OpenLDAP 2.4.13 Engineering
        Fixed slapo-rwm reusing freed filter (ITS#5732)
        Added slapo-translucent try local bind when remote fails (ITS#5656)
        Added slapo-translucent support for PasswordModify exop (ITS#5656)
+       Fixed tools simple bind without SASL (ITS#5753)
        Build Environment
                Added ldapurl command
                Added slapd GSSAPI refactoring (ITS#5369)

diff --git a/clients/tools/common.c b/clients/tools/common.c
index d468dd9969f743c66d392ec5ccdd0d9eed4bef97..5222d6321dc20af868509fa2e96ca1e78166231f 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -981,7 +981,11 @@ tool_args( int argc, char **argv )
 
        if (authmethod == -1 && protocol > LDAP_VERSION2) {
 #ifdef HAVE_CYRUS_SASL
-               authmethod = LDAP_AUTH_SASL;
+               if ( binddn != NULL ) {
+                       authmethod = LDAP_AUTH_SIMPLE;
+               } else {
+                       authmethod = LDAP_AUTH_SASL;
+               }
 #else
                authmethod = LDAP_AUTH_SIMPLE;
 #endif