andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 5 months ago
Clone
dc8c34
From e4c39bc3dcdd3b73544ba011677a42ce35ae3f4c Mon Sep 17 00:00:00 2001
dc8c34
From: Mark Reynolds <mreynolds@redhat.com>
dc8c34
Date: Thu, 1 Aug 2013 15:05:16 -0400
dc8c34
Subject: [PATCH 223/225] Ticket47426 - Coverity issue with last commit(move
dc8c34
 compute_idletimeout out of handle_pr_read_ready)
dc8c34
dc8c34
I had added a NULL check trying to avoid a coverity error, but pb->pb_conn can not be
dc8c34
NULL when it gets to this code.  Removed NULL check.
dc8c34
dc8c34
https://fedorahosted.org/389/ticket/47426
dc8c34
dc8c34
Reviewed by: ?
dc8c34
(cherry picked from commit a4daf1a0a65f796878b40b8ebc572082a1101f3b)
dc8c34
(cherry picked from commit 89b78da25aa79101d6b43529a7486c64feb5eda6)
dc8c34
(cherry picked from commit a184bbb92e59105ca196d793b87541c656081e12)
dc8c34
---
dc8c34
 ldap/servers/slapd/connection.c | 2 +-
dc8c34
 1 file changed, 1 insertion(+), 1 deletion(-)
dc8c34
dc8c34
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
dc8c34
index 7aea493..c2ec4a7 100644
dc8c34
--- a/ldap/servers/slapd/connection.c
dc8c34
+++ b/ldap/servers/slapd/connection.c
dc8c34
@@ -2210,7 +2210,7 @@ connection_threadmain()
dc8c34
 					   in connection_activity when the conn is added to the
dc8c34
 					   work queue, setup_pr_read_pds won't add the connection prfd
dc8c34
 					   to the poll list */
dc8c34
-					if(pb->pb_conn && pb->pb_conn->c_opscompleted == 0){
dc8c34
+					if(pb->pb_conn->c_opscompleted == 0){
dc8c34
 						/*
dc8c34
 						 * We have a new connection, set the anonymous reslimit idletimeout
dc8c34
 						 * if applicable.
dc8c34
-- 
dc8c34
1.8.1.4
dc8c34