consistently use dn_match macro throughout slapd

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index c81be967efd387d47ba0856c8e61bb679715a370..95594f56cc0c750eec389e8d0b44a2d60d8ee113 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1602,7 +1602,7 @@ aci_mask(
        }
 
        if (aci_strbvcmp( "self", &bv ) == 0) {
-               if (strcmp(op->o_ndn.bv_val, e->e_ndn) == 0)
+               if (dn_match(&op->o_ndn, &e->e_nname))
                        return(1);
 
        } else if (aci_strbvcmp( "dnattr", &bv ) == 0) {

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index f9eb8edac6cdab12bed02a5424b1469a803529be..96fdd1bf4af657ec996e7de01acf02676246b566 100644 (file)
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -58,7 +58,7 @@ bdb_attribute(
                target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
-       if (target != NULL && strcmp(target->e_ndn, entry_ndn->bv_val) == 0) {
+       if (target != NULL && dn_match(&target->e_nname, entry_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 71b001068ea8c08d3ff9cf2cc46482607a6924bd..9bd50a3a10816f5a04fe9d309348a37619852928 100644 (file)
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -69,7 +69,7 @@ bdb_group(
                target->e_ndn, 0, 0 ); 
 #endif
 
-       if (strcmp(target->e_ndn, gr_ndn->bv_val) == 0) {
+       if (dn_match(&target->e_name, gr_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 9bc266b74ae80a6e54cecf77afd9835acdb9048e..720aa179a7ac6cbd48294277472334bf1d6f0e48 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -123,7 +123,7 @@ dnssrv_back_search(
                }
        }
 
-       if( strcmp( nrefdn.bv_val, ndn->bv_val ) != 0 ) {
+       if( !dn_match( &nrefdn, ndn ) ) {
                /* requested dn is subordinate */
 
                Debug( LDAP_DEBUG_TRACE,

diff --git a/servers/slapd/back-ldap/group.c b/servers/slapd/back-ldap/group.c
index c519da293e8771c22ab84b4db84b6a29b86f67c8..c1410d3879b1bf0e8d368b62bfde7cd9b4c758b7 100644 (file)
--- a/servers/slapd/back-ldap/group.c
+++ b/servers/slapd/back-ldap/group.c
@@ -54,8 +54,7 @@ ldap_back_group(
        if (group_oc_name.bv_val)
                group_oc_name.bv_len = strlen(group_oc_name.bv_val);
 
-       if (target != NULL && target->e_nname.bv_len == gr_ndn->bv_len &&
-               strcmp(target->e_nname.bv_val, gr_ndn->bv_val) == 0) {
+       if (target != NULL && dn_match( &target->e_nname, gr_ndn ) ) {
                /* we already have a copy of the entry */
                /* attribute and objectclass mapping has already been done */
 

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
index 5a7dfa08691b14d858f7df2c409646d024bddf6e..92153f34a7ba36396a80105fa6583f136331c3e6 100644 (file)
--- a/servers/slapd/back-ldbm/attribute.c
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -59,7 +59,7 @@ ldbm_back_attribute(
                target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
-       if (target != NULL && strcmp(target->e_ndn, entry_ndn->bv_val) == 0) {
+       if (target != NULL && dn_match( &target->e_nname, entry_ndn) ) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index b752cd0107d5a5e553b2f5b7575aee77b3c53742..1ab39ac81cf523f036475fe56220a7bf1a9fbeca 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -291,8 +291,7 @@ ldbm_back_modrdn(
                np_ndn = nnewSuperior;
 
                /* newSuperior == oldParent? */
-               if ( p_ndn.bv_len == np_ndn->bv_len &&
-                       strcmp( p_ndn.bv_val, np_ndn->bv_val ) == 0 ) {
+               if ( dn_match( &p_ndn, np_ndn ) ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_INFO, "ldbm_back_modrdn: "
                                "new parent\"%s\" seems to be the same as the "

diff --git a/servers/slapd/back-meta/attribute.c b/servers/slapd/back-meta/attribute.c
index 02fa629324c8664993d1de6e1d757f4be02e2819..5bc98e577c5206ef15d5dc44cecc48bbc5a95271 100644 (file)
--- a/servers/slapd/back-meta/attribute.c
+++ b/servers/slapd/back-meta/attribute.c
@@ -105,8 +105,7 @@ meta_back_attribute(
        LDAP *ld;
 
        *vals = NULL;
-       if ( target != NULL && target->e_nname.bv_len == ndn->bv_len
-                       && strcmp( target->e_ndn, ndn->bv_val ) == 0 ) {
+       if ( target != NULL && dn_match( &target->e_nname, ndn ) ) {
                /* we already have a copy of the entry */
                /* attribute and objectclass mapping has already been done */
                attr = attr_find( target->e_attrs, entry_at );

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 3b550beb420b41aa834e92911bdb48d0cb5bbfaa..9c00cdc1a34ef3900c564b92bd7488ef46107b0d 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -235,8 +235,8 @@ meta_back_db_config(
                 * or worked out, at least, in some manner
                 */
                for ( j = 0; j < i-1; j++ ) {
-                       if ( strcmp( li->targets[ i ]->suffix.bv_val,
-                                       li->targets[ j ]->suffix.bv_val ) == 0 ) {
+                       if ( dn_match( &li->targets[ i ]->suffix,
+                                       &li->targets[ j ]->suffix ) ) {
                                fprintf( stderr,
        "%s: line %d: naming context \"%s\" already used"
        " in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",

diff --git a/servers/slapd/back-meta/group.c b/servers/slapd/back-meta/group.c
index 6d6ad2bb7cb8b13fa268659d25ed890252ef3e83..65481f71ebb469d447b7046f81dd5b730c800376 100644 (file)
--- a/servers/slapd/back-meta/group.c
+++ b/servers/slapd/back-meta/group.c
@@ -115,7 +115,7 @@ meta_back_group(
                group_oc_name.bv_len = strlen( group_oc_name.bv_val );
        }
 
-       if ( target != NULL && strcmp( target->e_nname.bv_val, gr_ndn->bv_val ) == 0 ) {
+       if ( target != NULL && dn_match( &target->e_nname, gr_ndn ) ) {
                /* we already have a copy of the entry */
                /* attribute and objectclass mapping has already been done */
 

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 3c5d842059471af4b69bcc38f9ae256e25324d86..e638770820c2cc9d6c6d9d099ae4c0c445453047 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -606,7 +606,7 @@ be_isroot( Backend *be, struct berval *ndn )
                return( 0 );
        }
 
-       return strcmp( be->be_rootndn.bv_val, ndn->bv_val ) ? 0 : 1;
+       return dn_match( &be->be_rootndn, ndn );
 }
 
 int
@@ -620,7 +620,7 @@ be_isupdate( Backend *be, struct berval *ndn )
                return( 0 );
        }
 
-       return strcmp( be->be_update_ndn.bv_val, ndn->bv_val ) ? 0 : 1;
+       return dn_match( &be->be_update_ndn, ndn );
 }
 
 struct berval *
@@ -994,8 +994,7 @@ backend_group(
        ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
        if (i) return SLAPD_ABANDON;
 
-       if( target->e_nname.bv_len != gr_ndn->bv_len ||
-               strcmp( target->e_nname.bv_val, gr_ndn->bv_val ) != 0 ) {
+       if ( !dn_match( &target->e_nname, gr_ndn ) ) {
                /* we won't attempt to send it to a different backend */
                
                be = select_backend( gr_ndn, 0,
@@ -1054,9 +1053,7 @@ backend_attribute(
        BVarray *vals
 )
 {
-       if( target == NULL || target->e_nname.bv_len != edn->bv_len ||
-               strcmp( target->e_ndn, edn->bv_val ) != 0 )
-       {
+       if ( target == NULL || !dn_match( &target->e_nname, edn ) ) {
                /* we won't attempt to send it to a different backend */
                
                be = select_backend( edn, 0,

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 0154626903e4836f0ffbf0f8b578b7c16aae45ab..2cddf4166b969d7e337e16ea521b56a2fed63345 100644 (file)
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -40,7 +40,7 @@ get_limits(
                        if ( ndn->bv_len == 0 ) {
                                break;
                        }
-                       if ( strcmp( lm[0]->lm_dn_pat.bv_val, ndn->bv_val ) == 0 ) {
+                       if ( dn_match( &lm[0]->lm_dn_pat, ndn ) ) {
                                *limit = &lm[0]->lm_limits;
                                return( 0 );
                        }
@@ -76,7 +76,8 @@ get_limits(
                        }
 
                        /* in case of (sub)match ... */
-                       if ( strcmp( lm[0]->lm_dn_pat.bv_val, &ndn->bv_val[d] ) == 0 ) {
+                       if ( lm[0]->lm_dn_pat.bv_len == ( ndn->bv_len - d )
+                                       && strcmp( lm[0]->lm_dn_pat.bv_val, &ndn->bv_val[d] ) == 0 ) {
                                /* check for exactly one rdn in case of ONE */
                                if ( lm[0]->lm_type == SLAP_LIMITS_ONE ) {
                                        /*