From fdc0dd7d6acafda760a24478dc76a59578a7acde Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 5 Oct 2001 21:49:04 +0000 Subject: [PATCH] Fix some NEW_LOGGING errors --- servers/slapd/acl.c | 7 +++---- servers/slapd/back-ldbm/cache.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index c71cee75bb..9ae0246de2 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -100,13 +100,12 @@ access_allowed( #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY, - "access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n", - conn->c_connid, access2str( access ), e->e_dn, attr )); + "access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n", + conn ? conn->c_connid : -1, access2str( access ), e->e_dn, attr )); #else Debug( LDAP_DEBUG_ACL, "=> access_allowed: %s access to \"%s\" \"%s\" requested\n", - access2str( access ), - e->e_dn, attr ); + access2str( access ), e->e_dn, attr ); #endif if ( op == NULL ) { diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c index 8f01250126..d9a7c65149 100644 --- a/servers/slapd/back-ldbm/cache.c +++ b/servers/slapd/back-ldbm/cache.c @@ -634,8 +634,8 @@ try_again: #ifdef NEW_LOGGING LDAP_LOG(( "cache", LDAP_LEVEL_INFO, - "cache_find_entry_dn2id: (%s)%ld not ready: %d\n", - dn, id, state )); + "cache_find_entry_dn2id: (%s) %ld not ready: %d\n", + ndn, id, state )); #else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n", @@ -656,8 +656,8 @@ try_again: #ifdef NEW_LOGGING LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, - "cache_find_entry_dn2id: (%s)%ld %d tries\n", - dn, id, count )); + "cache_find_entry_dn2id: (%s): %ld %d tries\n", + ndn, id, count )); #else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n", -- 2.39.5