From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 6 Sep 2002 03:35:49 +0000 (+0000)
Subject: bvmatch
X-Git-Tag: OPENLDAP_REL_ENG_2_1_5~50
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea7635cda96dd6455ad6ddcc8bdeed4e6e941bdd;p=openldap

bvmatch
---

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/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);