ldap/servers/slapd/control.c | 4 ++-- ldap/servers/slapd/dn.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 8b92149bf229d12052a2f349611e5f639fc57ef8 Author: Noriko Hosoi nhosoi@redhat.com Date: Tue Feb 25 15:09:34 2014 -0800
Ticket 571 (dup 47361) - Empty control list causes LDAP protocol error is thrown
covscan Defect type: Compiler Warnings 2. 389-ds-base-1.3.1.6/ldap/servers/slapd/control.c:364:25: warning - format '%d' expects argument of type 'int', but argument 4 has type 'PRUint64' [-Wformat=] Introduced by commit d695afb6a637432e880296d8552f466981c0796c Fix: Replaced %d with % NSPRIu64
Reviewed by rmeggins@redhat.com (Thank you, Rich!!) (cherry picked from commit 383db4a27cc417c1708989d84cf0e4445936ae9f)
diff --git a/ldap/servers/slapd/control.c b/ldap/servers/slapd/control.c index dbbf5b0..d97aa2f 100644 --- a/ldap/servers/slapd/control.c +++ b/ldap/servers/slapd/control.c @@ -366,8 +366,8 @@ get_ldapmessage_controls_ext( slapi_pblock_set(pb, SLAPI_REQCONTROLS, NULL); slapi_pblock_set(pb, SLAPI_MANAGEDSAIT, &ctrl_not_found); slapi_pblock_set(pb, SLAPI_PWPOLICY, &ctrl_not_found); - slapi_log_error(SLAPI_LOG_CONNS, "connection", "Warning: conn=%d op=%d contains an empty list of controls\n", - (int)pb->pb_conn->c_connid, pb->pb_op->o_opid); + slapi_log_error(SLAPI_LOG_CONNS, "connection", "Warning: conn=%" NSPRIu64 " op=%d contains an empty list of controls\n", + (long long unsigned int)pb->pb_conn->c_connid, pb->pb_op->o_opid); } else { if ((tag != LBER_END_OF_SEQORSET) && (len != -1)) { goto free_and_return;
commit 977c1b293beb0e8324a99614705ba316d46352f8 Author: Noriko Hosoi nhosoi@redhat.com Date: Tue Feb 25 14:33:48 2014 -0800
Ticket 408 - create a normalized dn cache
covscan Defect type: FORWARD_NULL 15. 389-ds-base-1.3.1.6/ldap/servers/slapd/dn.c:3036:var_deref_op - Dereferencing null pointer "node". Introduced by commit 1d6dd39fb8b0ef8eb42ec9ef8c3d325e27a3d3c1 Fix: Check if "node" is null or not before referencing.
Reviewed by rmeggins@redhat.com (Thank you, Rich!!) (cherry picked from commit 5ac08038a05877b4240755801debd5e5a3a94c6f)
diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c index 7515eee..51dcd99 100644 --- a/ldap/servers/slapd/dn.c +++ b/ldap/servers/slapd/dn.c @@ -3032,7 +3032,7 @@ ndn_cache_flush() int i;
node = ndn_cache->tail; - for(i = 0; i < NDN_FLUSH_COUNT && ndn_cache->cache_count > NDN_MIN_COUNT; i++){ + for(i = 0; node && i < NDN_FLUSH_COUNT && ndn_cache->cache_count > NDN_MIN_COUNT; i++){ flush_node = node; /* update the lru */ next = node->prev;
389-commits@lists.fedoraproject.org