Clean up some #else #if 'ing

[openldap] / servers / slapd / str2filter.c

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 3392aefbc498d6c7c543280a8243ff2d40802c63..ff7cd450adfc7eea72d5e479af5fd74831697131 100644 (file)
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -33,8 +33,7 @@ str2filter( const char *str )
        const char *text = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
-               "str2filter: \"%s\"\n", str ));
+       LDAP_LOG( FILTER, ENTRY,  "str2filter: \"%s\"\n", str, 0, 0 );
 #else
        Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 );
 #endif
@@ -48,7 +47,7 @@ str2filter( const char *str )
                return NULL;
        }
 
-       rc = ldap_int_put_filter( ber, str );
+       rc = ldap_pvt_put_filter( ber, str );
        if( rc < 0 ) {
                goto done;
        }