mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

should address ITS#3861

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-07-13 17:43:30 +00:00
parent 675b19dce6
commit 684860502e
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/slapd/back-sql/entry-id.c
View File

@ -459,7 +459,8 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
#ifdef BACKSQL_COUNTQUERY
unsigned long count,
countsize = sizeof( count ),
j;
j,
append = 0;
Attribute *attr = NULL;
slap_mr_normalize_func *normfunc = NULL;
@ -581,7 +582,7 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
}
} else {
Attribute **ap;
append = 1;
/* Make space for the array of values */
attr = (Attribute *) ch_malloc( sizeof( Attribute ) );
@ -609,10 +610,6 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
} else {
attr->a_nvals = attr->a_vals;
}
for ( ap = &bsi->bsi_e->e_attrs; (*ap) != NULL; ap = &(*ap)->a_next )
/* goto last */ ;
*ap = attr;
}
#endif /* BACKSQL_COUNTQUERY */
@ -804,6 +801,20 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
}
}
#ifdef BACKSQL_COUNTQUERY
if ( BER_BVISNULL( &attr->a_vals[ 0 ] ) ) {
/* don't leave around attributes with no values */
attr_free( attr );
} else if ( append ) {
Attribute **ap;
for ( ap = &bsi->bsi_e->e_attrs; (*ap) != NULL; ap = &(*ap)->a_next )
/* goto last */ ;
*ap = attr;
}
#endif /* BACKSQL_COUNTQUERY */
backsql_FreeRow( &row );
SQLFreeStmt( sth, SQL_DROP );
Debug( LDAP_DEBUG_TRACE, "<==backsql_get_attr_vals()\n", 0, 0, 0 );