From 857d08ea21b82cbbd83399c5498be8a8fd998851 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 2 Sep 2002 19:39:06 +0000
Subject: [PATCH] use bvmatch() instead of ber_bvcmp() when testing for match
 without ordering

---
 servers/slapd/acl.c         | 6 +++---
 servers/slapd/backend.c     | 6 +++---
 servers/slapd/bind.c        | 2 +-
 servers/slapd/extended.c    | 2 +-
 servers/slapd/schema_prep.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index fdb4cd1b63..3db4fd14e7 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -605,17 +605,17 @@ acl_mask(
 			 * user is bound as somebody in the same namespace as
 			 * the entry, OR the given dn matches the dn pattern
 			 */
-			if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_anonymous ) == 0 ) {
+			if ( bvmatch( &b->a_dn_pat, &aci_bv_anonymous ) ) {
 				if ( op->o_ndn.bv_len != 0 ) {
 					continue;
 				}
 
-			} else if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_users ) == 0 ) {
+			} else if ( bvmatch( &b->a_dn_pat, &aci_bv_users ) ) {
 				if ( op->o_ndn.bv_len == 0 ) {
 					continue;
 				}
 
-			} else if ( ber_bvcmp( &b->a_dn_pat, &aci_bv_self ) == 0 ) {
+			} else if ( bvmatch( &b->a_dn_pat, &aci_bv_self ) ) {
 				if ( op->o_ndn.bv_len == 0 ) {
 					continue;
 				}
diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index b5f3fe0440..987eb8832c 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -585,7 +585,7 @@ be_issuffix(
 	int	i;
 
 	for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i].bv_val != NULL; i++ ) {
-		if ( ber_bvcmp( &be->be_nsuffix[i], bvsuffix ) == 0 ) {
+		if ( bvmatch( &be->be_nsuffix[i], bvsuffix ) ) {
 			return( 1 );
 		}
 	}
@@ -821,7 +821,7 @@ backend_check_restrictions(
 
 		{
 			struct berval bv = BER_BVC( LDAP_EXOP_START_TLS );
-			if( ber_bvcmp( opdata, &bv ) == 0 ) {
+			if( bvmatch( opdata, &bv ) ) {
 				session++;
 				starttls++;
 				break;
@@ -830,7 +830,7 @@ backend_check_restrictions(
 
 		{
 			struct berval bv = BER_BVC( LDAP_EXOP_X_WHO_AM_I );
-			if( ber_bvcmp( opdata, &bv ) == 0 ) {
+			if( bvmatch( opdata, &bv ) ) {
 				break;
 			}
 		}
diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index e27873b8d1..646b72f657 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -277,7 +277,7 @@ do_bind(
 
 		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 		if ( conn->c_sasl_bind_in_progress ) {
-			if((ber_bvcmp(&conn->c_sasl_bind_mech, &mech) != 0)) {
+			if( !bvmatch( &conn->c_sasl_bind_mech, &mech ) ) {
 				/* mechanism changed between bind steps */
 				slap_sasl_reset(conn);
 			}
diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 2d315f36ce..0da22bdfbb 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -288,7 +288,7 @@ find_extop( struct extop_list *list, struct berval *oid )
 	struct extop_list *ext;
 
 	for (ext = list; ext; ext = ext->next) {
-		if (ber_bvcmp(&ext->oid, oid) == 0)
+		if (bvmatch(&ext->oid, oid))
 			return(ext);
 	}
 	return(NULL);
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 85fc05ddf3..25fb3ff286 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -177,7 +177,7 @@ static int objectSubClassIndexer(
 					k, ocvalues[k].bv_val, sup->soc_cname.bv_val );
 #endif
 #endif
-				if( ber_bvcmp( &ocvalues[k], &sup->soc_cname ) == 0 ) {
+				if( bvmatch( &ocvalues[k], &sup->soc_cname ) ) {
 					found++;
 					break;
 				}
-- 
2.39.5