ldap/servers/slapd/add.c | 3 +-- ldap/servers/slapd/back-ldbm/import-threads.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)

New commits: commit 6b9f1aac9e0e5059e10e0ed92e6e8d9c4d5f4253 Author: Rich Megginson rmeggins@redhat.com Date: Thu Oct 14 09:13:03 2010 -0600

remove extra format argument; use %lu for size_t printf format

Removed the extra proxydn format argument that was not being used Use %lu for size_t format arguments Reviewed by: nkinder (Thanks!)

diff --git a/ldap/servers/slapd/add.c b/ldap/servers/slapd/add.c index 93f4511..200d79c 100644 --- a/ldap/servers/slapd/add.c +++ b/ldap/servers/slapd/add.c @@ -497,8 +497,7 @@ static void op_shared_add (Slapi_PBlock *pb) slapi_log_access(LDAP_DEBUG_ARGS, "conn=%s op=%d ADD dn="%s"\n", LOG_INTERNAL_OP_CON_ID, LOG_INTERNAL_OP_OP_ID, - escape_string(slapi_entry_get_dn_const(e), ebuf), - proxystr ? proxystr : ""); + escape_string(slapi_entry_get_dn_const(e), ebuf)); } }

diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c index c00e4b7..d8153d7 100644 --- a/ldap/servers/slapd/back-ldbm/import-threads.c +++ b/ldap/servers/slapd/back-ldbm/import-threads.c @@ -726,8 +726,8 @@ import_producer(void *param) "ending line %d of file "%s"", escape_string(slapi_entry_get_dn(e), ebuf), curr_lineno, curr_filename); - import_log_notice(job, "REASON: entry too large (%u bytes) for " - "the buffer size (%u bytes)", newesize, job->fifo.bsize); + import_log_notice(job, "REASON: entry too large (%lu bytes) for " + "the buffer size (%lu bytes)", newesize, job->fifo.bsize); backentry_free(&ep); job->skipped++; continue;