From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 19:22:15 +0000 (+0000)
Subject: ITS#5753
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~99
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b4e2b9763074cf98586d12e4cffe72f22c69b36;p=openldap

ITS#5753
---

diff --git a/CHANGES b/CHANGES
index 200ce4f00c..ce70cbde22 100644
--- 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 d468dd9969..5222d6321d 100644
--- 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