Set peeraddr also for IPv6, fixes ITS#1918

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 001b0447ca746bc58b1c488b157ae224c86cbe7b..ead4af626e45d00cbc9611d403c19202e12178ff 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -41,7 +41,7 @@ do_compare(
        struct berval ndn = { 0, NULL };
        struct berval desc = { 0, NULL };
        struct berval value = { 0, NULL };
-       AttributeAssertion ava;
+       AttributeAssertion ava = { 0 };
        Backend *be;
        int rc = LDAP_SUCCESS;
        const char *text = NULL;
@@ -67,7 +67,7 @@ do_compare(
         *      }
         */
 
-       if ( ber_scanf( op->o_ber, "{o" /*}*/, &dn ) == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
                        "do_compare: conn %d  ber_scanf failed\n", conn->c_connid ));
@@ -79,7 +79,7 @@ do_compare(
                return SLAPD_DISCONNECT;
        }
 
-       if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "{mm}", &desc, &value ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
                        "do_compare: conn %d  get ava failed\n", conn->c_connid ));
@@ -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 );
 
@@ -222,13 +223,13 @@ do_compare(
         * if we don't hold it.
         */
        if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
-               BVarray ref = referral_rewrite( default_referral,
+               BerVarray ref = referral_rewrite( default_referral,
                        NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, ref ? ref : default_referral, NULL );
 
-               bvarray_free( ref );
+               ber_bvarray_free( ref );
                rc = 0;
                goto cleanup;
        }
@@ -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 );
 
@@ -274,11 +275,9 @@ do_compare(
        }
 
 cleanup:
-       free( dn.bv_val );
        free( pdn.bv_val );
        free( ndn.bv_val );
-       free( desc.bv_val );
-       free( value.bv_val );
+       if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val );
 
        return rc;
 }
@@ -293,7 +292,7 @@ static int compare_entry(
        Attribute *a;
 
        if ( ! access_allowed( NULL, conn, op, e,
-               ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
+               ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
        {       
                return LDAP_INSUFFICIENT_ACCESS;
        }