]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix typo in rev.14350
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 21 Dec 2015 21:55:05 +0000 (10:55 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 21 Dec 2015 21:55:05 +0000 (10:55 +1300)
src/security/PeerOptions.cc
src/security/ServerOptions.cc

index 3f85cab3b78078136f5c2511af1800a7b5606bfb..8b9d6446a3e531f6141c256cda773cee16f234fb 100644 (file)
@@ -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",":,");
index dd376de70cc0e5a5bfd40af0630ff40495a31539..2d112347dfc32a29645b1e57899e0a2410fda416 100644 (file)
@@ -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));
         }