X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcompare.c;h=ead4af626e45d00cbc9611d403c19202e12178ff;hb=62139b6ef3634529c6d1ff726c337e685ea38cf8;hp=91cf820c37d023e6bbf43070537b13484fa9ed67;hpb=32fb8b0bffe64559f5ec85d7ae82c3a35ec959c2;p=openldap diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c index 91cf820c37..ead4af626e 100644 --- a/servers/slapd/compare.c +++ b/servers/slapd/compare.c @@ -136,7 +136,8 @@ do_compare( goto cleanup; } - rc = value_normalize( ava.aa_desc, SLAP_MR_EQUALITY, &value, &ava.aa_value, &text ); + rc = value_validate_normalize( ava.aa_desc, SLAP_MR_EQUALITY, + &value, &ava.aa_value, &text ); if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); goto cleanup; @@ -154,7 +155,7 @@ do_compare( #endif Statslog( LDAP_DEBUG_STATS, - "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n", + "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n", op->o_connid, op->o_opid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val, 0 ); @@ -182,7 +183,7 @@ do_compare( #endif Statslog( LDAP_DEBUG_STATS, - "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n", + "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n", op->o_connid, op->o_opid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val, 0 ); @@ -257,7 +258,7 @@ do_compare( pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ); #endif - Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n", + Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n", op->o_connid, op->o_opid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val, 0 );