From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 11 Apr 2016 16:34:29 +0000 (-0600)
Subject: Removed ServerOptions "partial copy" copy constructor.
X-Git-Tag: SQUID_4_0_9~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f63271736b03ffa2100ab02005f29cb18306fc5d;p=thirdparty%2Fsquid.git

Removed ServerOptions "partial copy" copy constructor.

AFAICT, the default copy constructor should work and the removed
explicit constructor was not copying the staticContext member, for no
documented reason (that I could find). It was also unused [in my tests].

If the partial copy constructor was abused for something useful, then a
different approach should be found -- the one that does not violate the
standard copy constructor post-conditions.
---

diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc
index 8c6675b26c..34450af8ea 100644
--- a/src/security/ServerOptions.cc
+++ b/src/security/ServerOptions.cc
@@ -21,14 +21,6 @@
 #include <openssl/x509.h>
 #endif
 
-Security::ServerOptions::ServerOptions(const Security::ServerOptions &s) :
-    dh(s.dh),
-    dhParamsFile(s.dhParamsFile),
-    eecdhCurve(s.eecdhCurve),
-    parsedDhParams(s.parsedDhParams)
-{
-}
-
 void
 Security::ServerOptions::parse(const char *token)
 {
diff --git a/src/security/ServerOptions.h b/src/security/ServerOptions.h
index 692ad79ed5..ced552387c 100644
--- a/src/security/ServerOptions.h
+++ b/src/security/ServerOptions.h
@@ -23,7 +23,6 @@ public:
         // is more secure to have only a small set of trusted CA.
         flags.tlsDefaultCa.defaultTo(false);
     }
-    explicit ServerOptions(const Security::ServerOptions &);
     virtual ~ServerOptions() = default;
 
     /* Security::PeerOptions API */