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

Solaris doesn't like NULL pointers in printf, which now can occur since IA5string allows the empty string

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-02-26 23:57:34 +00:00
parent bae8df352b
commit 5d00861860
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/slapd/overlays/rwmmap.c
View File

@ -499,7 +499,7 @@ rwm_int_filter_map_rewrite(
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)", snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
atmp.bv_val, vtmp.bv_val ); atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
break; break;
@ -516,7 +516,7 @@ rwm_int_filter_map_rewrite(
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)", snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
atmp.bv_val, vtmp.bv_val ); atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
break; break;
@ -533,7 +533,7 @@ rwm_int_filter_map_rewrite(
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)", snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
atmp.bv_val, vtmp.bv_val ); atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
break; break;
@ -550,7 +550,7 @@ rwm_int_filter_map_rewrite(
fstr->bv_val = ch_malloc( fstr->bv_len + 1 ); fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)", snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
atmp.bv_val, vtmp.bv_val ); atmp.bv_val, vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
break; break;
@ -581,7 +581,7 @@ rwm_int_filter_map_rewrite(
snprintf( &fstr->bv_val[len - 2], vtmp.bv_len + 3, snprintf( &fstr->bv_val[len - 2], vtmp.bv_len + 3,
/* "(attr=" */ "%s*)", /* "(attr=" */ "%s*)",
vtmp.bv_val ); vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
} }
@ -596,7 +596,7 @@ rwm_int_filter_map_rewrite(
snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3, snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
/* "(attr=[init]*[any*]" */ "%s*)", /* "(attr=[init]*[any*]" */ "%s*)",
vtmp.bv_val ); vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
} }
} }
@ -611,7 +611,7 @@ rwm_int_filter_map_rewrite(
snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3, snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
/* "(attr=[init*][any*]" */ "%s)", /* "(attr=[init*][any*]" */ "%s)",
vtmp.bv_val ); vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
} }
@ -657,7 +657,7 @@ rwm_int_filter_map_rewrite(
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 ); fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
snprintf( &fstr->bv_val[len-1], vtmp.bv_len + 2, snprintf( &fstr->bv_val[len-1], vtmp.bv_len + 2,
/*"("*/ "%s)", vtmp.bv_val ); /*"("*/ "%s)", vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
} }
@ -690,7 +690,7 @@ rwm_int_filter_map_rewrite(
f->f_mr_dnattrs ? ":dn" : "", f->f_mr_dnattrs ? ":dn" : "",
!BER_BVISEMPTY( &f->f_mr_rule_text ) ? ":" : "", !BER_BVISEMPTY( &f->f_mr_rule_text ) ? ":" : "",
!BER_BVISEMPTY( &f->f_mr_rule_text ) ? f->f_mr_rule_text.bv_val : "", !BER_BVISEMPTY( &f->f_mr_rule_text ) ? f->f_mr_rule_text.bv_val : "",
vtmp.bv_val ); vtmp.bv_len ? vtmp.bv_val : "" );
ch_free( vtmp.bv_val ); ch_free( vtmp.bv_val );
break; break;
} }