From: Pierangelo Masarati Date: Mon, 8 Apr 2002 18:39:23 +0000 (+0000) Subject: ITS#1730 X-Git-Tag: OPENLDAP_REL_ENG_2_MP~241 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4a2b9b21951cb9966f98cd49064e856f6ff7e6a4;p=openldap ITS#1730 --- diff --git a/libraries/libldap/cache.c b/libraries/libldap/cache.c index 3f56e18b80..b9d4747438 100644 --- a/libraries/libldap/cache.c +++ b/libraries/libldap/cache.c @@ -776,7 +776,7 @@ check_cache_memused( LDAPCache *lc ) #ifdef NEW_LOGGING LDAP_LOG (( "cache", LDAP_LEVEL_DETAIL1, "check_cache_memused: reduced usage to %ld bytes\n", - lc->lm_memused )); + lc->lc_memused )); #else Debug( LDAP_DEBUG_TRACE, "ccm: reduced usage to %ld bytes\n", lc->lc_memused, 0, 0 ); diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c index b7ffabc227..1850679628 100644 --- a/servers/slapd/back-meta/bind.c +++ b/servers/slapd/back-meta/bind.c @@ -424,7 +424,7 @@ meta_back_op_result( struct metaconn *lc, Operation *op ) err = ldap_back_map_result( err ); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_DEBUG_NOTICE, + LDAP_LOG(( "backend", LDAP_DEBUG_ANY, "meta_back_op_result: target" " <%d> sending msg \"%s\"" " (matched \"%s\")\n", diff --git a/servers/slapd/back-meta/group.c b/servers/slapd/back-meta/group.c index 972b87031b..53b5ed5aee 100644 --- a/servers/slapd/back-meta/group.c +++ b/servers/slapd/back-meta/group.c @@ -173,7 +173,7 @@ meta_back_group( #ifdef NEW_LOGGING LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, "[rw] bindDn (op ndn in group):" - \"%s\" -> \"%s\"\n", + " \"%s\" -> \"%s\"\n", op_ndn->bv_val, mop_ndn.bv_val)); #else /* !NEW_LOGGING */ Debug( LDAP_DEBUG_ARGS, diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index 94ab4b6758..e855ae1c54 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -522,7 +522,7 @@ monitor_back_db_config( ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_DEBUG_NOTICE, + LDAP_LOG(( "config", LDAP_DEBUG_CONFIG, "line %d of file '%s' will be ignored\n", lineno, fname )); #else Debug( LDAP_DEBUG_CONFIG, diff --git a/servers/slapd/config.c b/servers/slapd/config.c index b5d69c67cd..84a33a057e 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -2147,7 +2147,7 @@ read_config( const char *fname ) if (module_load(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "%s: line %d: failed to load or initialize module %s\n"< + "%s: line %d: failed to load or initialize module %s\n", fname, lineno, cargv[1] )); #else Debug( LDAP_DEBUG_ANY,