Fix ITS#3424

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 754f7ec53f85964012eda768bf6a54c740e002fd..5b8665f67d2bd245ba4f29867b48e1b4ce87e795 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -38,13 +38,10 @@ void
 ava_free(
        Operation *op,
        AttributeAssertion *ava,
-       int     freeit
-)
+       int     freeit )
 {
        op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
-       if ( freeit ) {
-               op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
-       }
+       if ( freeit ) op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
 }
 
 int
@@ -53,8 +50,7 @@ get_ava(
        BerElement      *ber,
        AttributeAssertion      **ava,
        unsigned usage,
-       const char **text
-)
+       const char **text )
 {
        int rc;
        ber_tag_t rtag;
@@ -64,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;
        }
@@ -80,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;
        }
@@ -96,18 +83,12 @@ 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;
        }
 
        *ava = aa;
-
        return LDAP_SUCCESS;
 }