upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

more fixes/updates

Browse source
This commit is contained in:
Pierangelo Masarati 2002-01-04 19:23:10 +00:00
parent 3c415e0807
commit b28c3953d4
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-ldap/map.c
View file

@ -236,6 +236,8 @@ ldap_back_map_attrs(
i++;
}
}
na[i] = NULL;
return(na);
}

14
servers/slapd/back-meta/search.c
View file

@ -347,7 +347,7 @@ meta_back_search(
if ( mapped_filter == NULL ) {
mapped_filter = ( char * )mfilter.bv_val;
} else {
ber_memfree( mfilter.bv_val );
free( mfilter.bv_val );
}
mfilter.bv_val = NULL;
mfilter.bv_len = 0;
@ -641,6 +641,9 @@ meta_send_entry(
while ( ber_scanf( &ber, "{o", &a ) != LBER_ERROR ) {
ldap_back_map( &li->targets[ target ]->at_map,
&a, &mapped, 1 );
if ( mapped.bv_val != a.bv_val ) {
free( a.bv_val );
}
if ( mapped.bv_val == NULL ) {
continue;
}
@ -668,9 +671,16 @@ meta_send_entry(
}
}
/* no subschemaSubentry */
if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry ) {
ch_free(attr);
continue;
}
if ( ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR ) {
attr->a_vals = &dummy;
} else if ( strcasecmp( mapped.bv_val, "objectClass" ) == 0 ) {
} else if ( attr->a_desc == slap_schema.si_ad_objectClass
|| attr->a_desc == slap_schema.si_ad_structuralObjectClass ) {
int i, last;
for ( last = 0; attr->a_vals[ last ].bv_val; ++last );
for ( i = 0, bv = attr->a_vals; bv->bv_val; bv++, i++ ) {