mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
Don't mask error text variables
This commit is contained in:
parent
27cb98d28d
commit
b5020aa16d
@ -281,7 +281,6 @@ modify_add_values(
|
|||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The original code performs ( n ) normalizations
|
* The original code performs ( n ) normalizations
|
||||||
* and ( n * ( n - 1 ) / 2 ) matches, which hide
|
* and ( n * ( n - 1 ) / 2 ) matches, which hide
|
||||||
@ -310,8 +309,6 @@ modify_add_values(
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
int rc;
|
int rc;
|
||||||
const char *text = NULL;
|
|
||||||
char textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
|
|
||||||
|
|
||||||
if ( mod->sm_bvalues[ 1 ].bv_val == 0 ) {
|
if ( mod->sm_bvalues[ 1 ].bv_val == 0 ) {
|
||||||
if ( a != NULL ) {
|
if ( a != NULL ) {
|
||||||
@ -319,7 +316,7 @@ modify_add_values(
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
|
rc = value_normalize( mod->sm_desc, SLAP_MR_EQUALITY,
|
||||||
&mod->sm_bvalues[ 0 ], &asserted, &text );
|
&mod->sm_bvalues[ 0 ], &asserted, text );
|
||||||
|
|
||||||
if ( rc != LDAP_SUCCESS ) {
|
if ( rc != LDAP_SUCCESS ) {
|
||||||
return rc;
|
return rc;
|
||||||
@ -330,7 +327,7 @@ modify_add_values(
|
|||||||
|
|
||||||
rc = value_match( &match, mod->sm_desc, mr,
|
rc = value_match( &match, mod->sm_desc, mr,
|
||||||
SLAP_MR_VALUE_SYNTAX_MATCH,
|
SLAP_MR_VALUE_SYNTAX_MATCH,
|
||||||
&a->a_vals[ i ], &asserted, &text );
|
&a->a_vals[ i ], &asserted, text );
|
||||||
|
|
||||||
if( rc == LDAP_SUCCESS && match == 0 ) {
|
if( rc == LDAP_SUCCESS && match == 0 ) {
|
||||||
free( asserted.bv_val );
|
free( asserted.bv_val );
|
||||||
@ -342,7 +339,7 @@ modify_add_values(
|
|||||||
} else {
|
} else {
|
||||||
rc = modify_check_duplicates( mod->sm_desc, mr,
|
rc = modify_check_duplicates( mod->sm_desc, mr,
|
||||||
a ? a->a_vals : NULL, mod->sm_bvalues,
|
a ? a->a_vals : NULL, mod->sm_bvalues,
|
||||||
&text, textbuf, sizeof( textbuf ) );
|
text, textbuf, textlen );
|
||||||
|
|
||||||
if ( rc != LDAP_SUCCESS ) {
|
if ( rc != LDAP_SUCCESS ) {
|
||||||
return rc;
|
return rc;
|
||||||
|
Loading…
Reference in New Issue
Block a user