trim spurious e_ndn also from back-meta

This commit is contained in:
Pierangelo Masarati 2001-12-24 17:24:07 +00:00
parent 6e3ec13e05
commit 7aedd4972d
2 changed files with 5 additions and 5 deletions

View File

@ -89,7 +89,7 @@ meta_back_attribute(
Connection *conn, Connection *conn,
Operation *op, Operation *op,
Entry *target, Entry *target,
const char *e_ndn, const char *ndn,
AttributeDescription *entry_at, AttributeDescription *entry_at,
struct berval ***vals struct berval ***vals
) )
@ -104,7 +104,7 @@ meta_back_attribute(
LDAP *ld; LDAP *ld;
*vals = NULL; *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 */ /* we already have a copy of the entry */
/* attribute and objectclass mapping has already been done */ /* attribute and objectclass mapping has already been done */
attr = attr_find( target->e_attrs, entry_at ); attr = attr_find( target->e_attrs, entry_at );
@ -132,7 +132,7 @@ meta_back_attribute(
return rc; return rc;
} /* else */ } /* else */
candidate = meta_back_select_unique_candidate( li, e_ndn ); candidate = meta_back_select_unique_candidate( li, ndn );
if ( candidate == -1 ) { if ( candidate == -1 ) {
return 1; return 1;
} }
@ -155,7 +155,7 @@ meta_back_attribute(
gattr[ 0 ] = mapped; gattr[ 0 ] = mapped;
gattr[ 1 ] = NULL; 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, gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
LDAP_NO_LIMIT, &result) == LDAP_SUCCESS) { LDAP_NO_LIMIT, &result) == LDAP_SUCCESS) {
if ( ( e = ldap_first_entry( ld, result ) ) != NULL ) { if ( ( e = ldap_first_entry( ld, result ) ) != NULL ) {

View File

@ -200,7 +200,7 @@ meta_back_attribute LDAP_P((
Connection *conn, Connection *conn,
Operation *op, Operation *op,
Entry *target, Entry *target,
const char* e_ndn, const char* ndn,
AttributeDescription* entry_at, AttributeDescription* entry_at,
struct berval ***vals struct berval ***vals
)); ));