From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 16 Jan 2007 11:40:17 +0000 (+0000)
Subject: fix dumb overparanoid test
X-Git-Tag: OPENLDAP_REL_ENG_2_3_33~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a77b2b7d919dbcc9fe722b2015fbdc832f15b52a;p=thirdparty%2Fopenldap.git

fix dumb overparanoid test
---

diff --git a/CHANGES b/CHANGES
index 94cf734d30..5643d20f12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 OpenLDAP 2.3 Change Log
+	Fixed slapd-meta typo in assert
 
 OpenLDAP 2.3.33 Release (2007/01/12)
 	Fixed slapd syncrepl error logging with delta-syncrepl
diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 68635053e2..6c2ff11abc 100644
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -1698,7 +1698,7 @@ meta_back_release_conn_lock(
 			tmpmc = avl_delete( &mi->mi_conninfo.lai_tree,
 				( caddr_t )mc, meta_back_conndnmc_cmp );
 
-			assert( tmpmc == NULL && tmpmc == mc );
+			assert( tmpmc == NULL || tmpmc == mc );
 		}
 
 		LDAP_BACK_CONN_CACHED_CLEAR( mc );