Fix ITS#3424

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 9e071408f5a88b949dd4ca0c90dc1b87c108e17d..5b8665f67d2bd245ba4f29867b48e1b4ce87e795 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -60,11 +60,7 @@ get_ava(
        rtag = ber_scanf( ber, "{mm}", &type, &value );
 
        if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( FILTER, ERR, "get_ava:  ber_scanf failure\n", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "  get_ava ber_scanf\n", 0, 0, 0 );
-#endif
                *text = "Error decoding attribute value assertion";
                return SLAPD_DISCONNECT;
        }
@@ -76,13 +72,8 @@ get_ava(
        rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
        if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( FILTER, ERR,
-               "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_FILTER,
                "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
-#endif
                op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }
@@ -92,13 +83,8 @@ get_ava(
                usage, &value, &aa->aa_value, text, op->o_tmpmemctx );
 
        if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( FILTER, ERR,
-               "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_FILTER,
                "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
-#endif
                op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }