ITS#1708 ldap_pvt_tls_sb_ctx() et al

[openldap] / libraries / libldap / search.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index c8e276a6635af17e1f90e61675c094c103fb9e06..c0bc46df7899dae708c45b7ce4e559d476bc1fb2 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -61,7 +61,11 @@ ldap_search_ext(
        BerElement      *ber;
        int timelimit;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "search", LDAP_LEVEL_ENTRY, "ldap_search_ext\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -179,7 +183,11 @@ ldap_search(
 {
        BerElement      *ber;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "search", LDAP_LEVEL_ENTRY, "ldap_search\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_search\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -295,7 +303,7 @@ ldap_build_search_req(
                filter = "(objectclass=*)";
        }
 
-       err = ldap_int_put_filter( ber, filter );
+       err = ldap_pvt_put_filter( ber, filter );
 
        if ( err  == -1 ) {
                ld->ld_errno = LDAP_FILTER_ERROR;