mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninit'd var, check for single-valued attrs

Browse Source
This commit is contained in:
Howard Chu 2005-08-24 01:34:49 +00:00
parent c33124e698
commit c947cfd66a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
servers/slapd/overlays/valsort.c
View File

@ -87,7 +87,7 @@ valsort_cf_func(ConfigArgs *c) {
valsort_info vitmp, *vi;
const char *text = NULL;
int i;
struct berval bv;
struct berval bv = BER_BVNULL;
if ( c->op == SLAP_CONFIG_EMIT ) {
for ( vi = on->on_bi.bi_private; vi; vi = vi->vi_next ) {
@ -112,12 +112,14 @@ valsort_cf_func(ConfigArgs *c) {
*ptr++ = '"';
ptr = lutil_strcopy( ptr, vi->vi_dn.bv_val );
*ptr++ = '"';
*ptr++ = ' ';
if ( vi->vi_sort & VALSORT_WEIGHTED ) {
ptr = lutil_strcopy( ptr, bv2.bv_val );
*ptr++ = ' ';
ptr = lutil_strcopy( ptr, bv2.bv_val );
}
if ( !BER_BVISNULL( &bv )) {
*ptr++ = ' ';
strcpy( ptr, bv.bv_val );
}
strcpy( ptr, bv.bv_val );
ber_bvarray_add( &c->rvalue_vals, &bvret );
}
i = ( c->rvalue_vals != NULL ) ? 0 : 1;
@ -149,6 +151,13 @@ valsort_cf_func(ConfigArgs *c) {
c->log, c->msg, c->argv[1] );
return(1);
}
if ( is_at_single_value( vitmp.vi_ad->ad_type )) {
sprintf( c->msg, "<%s> %s is single-valued, ignoring", c->argv[0],
vitmp.vi_ad->ad_cname.bv_val );
Debug( LDAP_DEBUG_ANY, "%s: %s (%s)!\n",
c->log, c->msg, c->argv[1] );
return(0);
}
ber_str2bv( c->argv[2], 0, 0, &bv );
i = dnNormalize( 0, NULL, NULL, &bv, &vitmp.vi_dn, NULL );
if ( i ) {