andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 6 months ago
Clone

Blame SOURCES/0025-Ticket-47928-Disable-SSL-v3-by-default.patch

f92ce9
From 02e9d25e7836bc5f350bc81d78ed2b8dd457f9b2 Mon Sep 17 00:00:00 2001
f92ce9
From: Noriko Hosoi <nhosoi@redhat.com>
f92ce9
Date: Mon, 27 Oct 2014 09:24:46 -0700
f92ce9
Subject: [PATCH 25/28] Ticket #47928 - Disable SSL v3, by default.
f92ce9
f92ce9
Description: commit c1ecd8b659a0b8f7d84f8157cb69810c85ee26e4
f92ce9
introdueced a coverity defect: 12783 - Logically dead code
f92ce9
f92ce9
This patch removes the dead code.
f92ce9
f92ce9
https://fedorahosted.org/389/ticket/47928
f92ce9
f92ce9
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
f92ce9
f92ce9
(cherry picked from commit 77989d3bb5471542db50d66de77cc40fe4500cbd)
f92ce9
(cherry picked from commit 29a41604ce48855bd6d96bbd83cbae870deaa8d7)
f92ce9
---
f92ce9
 ldap/servers/slapd/ssl.c | 5 -----
f92ce9
 1 file changed, 5 deletions(-)
f92ce9
f92ce9
diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c
f92ce9
index 26ef251..f81d1fb 100644
f92ce9
--- a/ldap/servers/slapd/ssl.c
f92ce9
+++ b/ldap/servers/slapd/ssl.c
f92ce9
@@ -1215,7 +1215,6 @@ slapd_ssl_init()
f92ce9
     PRErrorCode errorCode;
f92ce9
     char ** family_list;
f92ce9
     char *val = NULL;
f92ce9
-    int rv = 0;
f92ce9
     PK11SlotInfo *slot;
f92ce9
     Slapi_Entry *entry = NULL;
f92ce9
 
f92ce9
@@ -1334,10 +1333,6 @@ slapd_ssl_init()
f92ce9
      * already been executed. */
f92ce9
     _security_library_initialized = 1; 
f92ce9
 
f92ce9
-    if ( rv != 0 ) {
f92ce9
-        return rv;
f92ce9
-    }
f92ce9
-
f92ce9
     return 0;
f92ce9
 }
f92ce9
 
f92ce9
-- 
f92ce9
1.9.3
f92ce9