From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 29 Mar 2008 18:17:21 +0000 (+0000)
Subject: a connection cannot be privileged and be in the avl tree at the same time (related... 
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~49
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3eeb814584e3a0622ccff856fc78b5fcf9c8578;p=openldap

a connection cannot be privileged and be in the avl tree at the same time (related to ITS#5440?)
---

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 3f74836281..bcfd191526 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -145,7 +145,7 @@ meta_back_bind( Operation *op, SlapReply *rs )
 			rc = LDAP_SUCCESS;
 			gotit = 1;
 
-		} else if ( isroot == 0 ) {
+		} else if ( !isroot ) {
 			/*
 			 * A bind operation is expected to have
 			 * ONE CANDIDATE ONLY!
@@ -249,10 +249,15 @@ meta_back_bind( Operation *op, SlapReply *rs )
 			meta_back_print_conntree( mi, "<<< meta_back_bind" );
 #endif /* META_BACK_PRINT_CONNTREE */
 			if ( lerr == 0 ) {
+#if 0
+				/* NOTE: a connection cannot be privileged
+				 * and be in the avl tree at the same time
+				 */
 				if ( isroot ) {
 					LDAP_BACK_CONN_ISPRIV_SET( mc );
 					LDAP_BACK_PCONN_SET( mc, op );
 				}
+#endif
 				LDAP_BACK_CONN_CACHED_SET( mc );
 
 			} else {