ITS#1730

diff --git a/libraries/libldap/cache.c b/libraries/libldap/cache.c
index 3f56e18b80f15232ffc41e8c13f5e47397829e4d..b9d47474389fc6729da8ba7dea085a0e35a11e48 100644 (file)
--- 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 b7ffabc227d9d55d1b20ee8cd330fce8cd8ef406..185067962836d4f9d35868e1683905f9e730b472 100644 (file)
--- 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 972b87031b1480eb6e56afb05f0c0c2826274b8b..53b5ed5aee298853e73f080fe2f80d98ca875eb2 100644 (file)
--- 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 94ab4b675856db93e490f9e4c79fcda392f21731..e855ae1c549e75be8a7ffdda3ed667f20d5354e8 100644 (file)
--- 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 b5d69c67cd99eea9f267d489506e0bba2d17cb0b..84a33a057e7c17a6b5cc0100fbc1b36c349ffe41 100644 (file)
--- 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,