Added LDAP_LOG messages

diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c
index fcd27166bfe9c4960e78a8520e852d8cac5e3fde..d6f62f325504289bc915c5fe5d3ad9e3d0cbf84e 100644 (file)
--- a/libraries/libldap/getfilter.c
+++ b/libraries/libldap/getfilter.c
@@ -78,9 +78,15 @@ ldap_init_getfilter_buf( char *buf, ber_len_t buflen )
                char error[512];
                regerror(rc, &re, error, sizeof(error));
                ldap_getfilter_free( lfdp );
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "getfilter", LDAP_LEVEL_ERR, 
+                       "ldap_init_get_filter_buf: bad regular expression %s, %s\n",
+                       nextflp->lfl_pattern, error ));
+#else
                Debug( LDAP_DEBUG_ANY, "ldap_init_get_filter_buf: "
                        "bad regular expression %s, %s\n",
                        nextflp->lfl_pattern, error, 0 );
+#endif
                errno = EINVAL;
                LDAP_VFREE( tok );
                return( NULL );

diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index 954397e9d1ada3c0440f3675b40ccbb43e0d13a0..bbf16d8c411c3e6b8981527cd216ea12517b8f56 100644 (file)
--- a/libraries/libldap/getvalues.c
+++ b/libraries/libldap/getvalues.c
@@ -36,7 +36,11 @@ ldap_get_values( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
        assert( entry != NULL );
        assert( target != NULL );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "getvalues", LDAP_LEVEL_ENTRY, "ldap_get_values\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_get_values\n", 0, 0, 0 );
+#endif
 
        ber = *entry->lm_ber;
 
@@ -93,7 +97,11 @@ ldap_get_values_len( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
        assert( entry != NULL );
        assert( target != NULL );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "getvalues", LDAP_LEVEL_ENTRY, "ldap_get_values_len\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_get_values_len\n", 0, 0, 0 );
+#endif
 
        ber = *entry->lm_ber;