From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 11 Apr 2007 08:57:41 +0000 (+0000)
Subject: don't assert(0); apparently, other responses may result from a simple bind (but log... 
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~535
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f29a4e140ed99beaf9345f5b9480370a45d42e38;p=openldap

don't assert(0); apparently, other responses may result from a simple bind (but log them, at least; ITS#4924)
---

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index f139e647eb..0131b4ef0d 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -467,7 +467,10 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
 			++lc->lconn_refcnt;	/* avoid premature free */
 			ld->ld_defconn = lc;
 
-			Debug( LDAP_DEBUG_TRACE, "anonymous rebind via ldap_bind_s\n", 0, 0, 0);
+			Debug( LDAP_DEBUG_TRACE,
+				"anonymous rebind via ldap_sasl_bind(\"\")\n",
+				0, 0, 0);
+
 #ifdef LDAP_R_COMPILE
 			ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
 			ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
@@ -505,7 +508,13 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
 						break;
 
 					default:
-						assert( 0 );
+						Debug( LDAP_DEBUG_TRACE,
+							"ldap_new_connection %p: "
+							"unexpected response %d "
+							"from BIND request id=%d\n",
+							ld, ldap_msgtype( res ), msgid );
+						err = -1;
+						break;
 					}
 				}
 			}