From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 21 Dec 2015 21:55:05 +0000 (+1300)
Subject: Fix typo in rev.14350
X-Git-Tag: SQUID_4_0_4~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40bc593b55982402f8bc4a0dbab53d16d9de108b;p=thirdparty%2Fsquid.git

Fix typo in rev.14350
---

diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc
index 3f85cab3b7..8b9d6446a3 100644
--- a/src/security/PeerOptions.cc
+++ b/src/security/PeerOptions.cc
@@ -433,19 +433,17 @@ Security::PeerOptions::parseOptions()
             }
         }
 
-        if (!value) {
-            fatalf("Unknown TLS option '" SQUIDSBUFPH "'", SQUIDSBUFPRINT(option));
-        }
-
-        switch (mode) {
-
-        case MODE_ADD:
-            op |= value;
-            break;
-
-        case MODE_REMOVE:
-            op &= ~value;
-            break;
+        if (value) {
+            switch (mode) {
+            case MODE_ADD:
+                op |= value;
+                break;
+           case MODE_REMOVE:
+                op &= ~value;
+                break;
+            }
+        } else {
+            debugs(83, DBG_PARSE_NOTE(1), "ERROR: Unknown TLS option " << option);
         }
 
         static const CharacterSet delims("TLS-option-delim",":,");
diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc
index dd376de70c..2d112347df 100644
--- a/src/security/ServerOptions.cc
+++ b/src/security/ServerOptions.cc
@@ -177,7 +177,7 @@ Security::ServerOptions::updateContextEecdh(Security::ContextPtr &ctx)
             return;
         }
 
-        if (SSL_CTX_set_tmp_ecdh(ctx, ecdh) != 0) {
+        if (!SSL_CTX_set_tmp_ecdh(ctx, ecdh)) {
             auto ssl_error = ERR_get_error();
             debugs(83, DBG_CRITICAL, "ERROR: Unable to set Ephemeral ECDH: " << ERR_error_string(ssl_error, NULL));
         }