trim spurious e_ndn also from back-meta

diff --git a/servers/slapd/back-meta/attribute.c b/servers/slapd/back-meta/attribute.c
index f8c894a21c7280a903988c14b5306b936a89661e..8d6e64677a3df32f79d867edee36ca8c347785a0 100644 (file)
--- a/servers/slapd/back-meta/attribute.c
+++ b/servers/slapd/back-meta/attribute.c
@@ -89,7 +89,7 @@ meta_back_attribute(
                Connection              *conn,
                Operation               *op,
                Entry                   *target,
-               const char              *e_ndn,
+               const char              *ndn,
                AttributeDescription    *entry_at,
                struct berval           ***vals
 )
@@ -104,7 +104,7 @@ meta_back_attribute(
        LDAP *ld;
 
        *vals = NULL;
-       if ( target != NULL && strcmp( target->e_ndn, e_ndn ) == 0 ) {
+       if ( target != NULL && strcmp( target->e_ndn, ndn ) == 0 ) {
                /* we already have a copy of the entry */
                /* attribute and objectclass mapping has already been done */
                attr = attr_find( target->e_attrs, entry_at );
@@ -132,7 +132,7 @@ meta_back_attribute(
                return rc;
        } /* else */
 
-       candidate = meta_back_select_unique_candidate( li, e_ndn );
+       candidate = meta_back_select_unique_candidate( li, ndn );
        if ( candidate == -1 ) {
                return 1;
        }
@@ -155,7 +155,7 @@ meta_back_attribute(
 
        gattr[ 0 ] = mapped;
        gattr[ 1 ] = NULL;
-       if ( ldap_search_ext_s( ld, e_ndn, LDAP_SCOPE_BASE, "(objectclass=*)",
+       if ( ldap_search_ext_s( ld, ndn, LDAP_SCOPE_BASE, "(objectclass=*)",
                                gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
                                LDAP_NO_LIMIT, &result) == LDAP_SUCCESS) {
                if ( ( e = ldap_first_entry( ld, result ) ) != NULL ) {

diff --git a/servers/slapd/back-meta/external.h b/servers/slapd/back-meta/external.h
index 814b22bd58e32c68bf8fcd7cb6f2ab470eecf5db..a703ce644aab2dd100faf56ced835ef2628e1564 100644 (file)
--- a/servers/slapd/back-meta/external.h
+++ b/servers/slapd/back-meta/external.h
@@ -200,7 +200,7 @@ meta_back_attribute LDAP_P((
                Connection *conn,
                Operation *op,
                Entry *target,
-               const char* e_ndn,
+               const char* ndn,
                AttributeDescription* entry_at,
                struct berval ***vals
 ));