From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 28 Jan 2017 10:08:09 +0000 (+1300)
Subject: Use default copy constructor and assignment
X-Git-Tag: M-staged-PR71~284^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d32a1b22ef8272382886f59f4b1aaf27e9fec4c;p=thirdparty%2Fsquid.git

Use default copy constructor and assignment

This fixes one bug in PeerOptions::flags handling
---

diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc
index cb0778f31b..0aa2b53313 100644
--- a/src/security/PeerOptions.cc
+++ b/src/security/PeerOptions.cc
@@ -27,44 +27,6 @@ Security::PeerOptions::PeerOptions()
      parseOptions();
 }
 
-Security::PeerOptions::PeerOptions(const Security::PeerOptions &p) :
-    sslOptions(p.sslOptions),
-    caDir(p.caDir),
-    crlFile(p.crlFile),
-    sslCipher(p.sslCipher),
-    sslFlags(p.sslFlags),
-    sslDomain(p.sslDomain),
-    parsedOptions(p.parsedOptions),
-    parsedFlags(p.parsedFlags),
-    certs(p.certs),
-    caFiles(p.caFiles),
-    parsedCrl(p.parsedCrl),
-    sslVersion(p.sslVersion),
-    encryptTransport(p.encryptTransport)
-{
-    memcpy(&flags, &p.flags, sizeof(flags));
-}
-
-Security::PeerOptions &
-Security::PeerOptions::operator =(const Security::PeerOptions &p)
-{
-    sslOptions = p.sslOptions;
-    caDir = p.caDir;
-    crlFile = p.crlFile;
-    sslCipher = p.sslCipher;
-    sslFlags = p.sslFlags;
-    sslDomain = p.sslDomain;
-    parsedOptions = p.parsedOptions;
-    parsedFlags = p.parsedFlags;
-    certs = p.certs;
-    caFiles = p.caFiles;
-    parsedCrl = p.parsedCrl;
-    sslVersion = p.sslVersion;
-    encryptTransport = p.encryptTransport;
-    memcpy(&flags, &p.flags, sizeof(flags));
-    return *this;
-}
-
 void
 Security::PeerOptions::parse(const char *token)
 {
diff --git a/src/security/PeerOptions.h b/src/security/PeerOptions.h
index c2f86201db..ca1eabc4fc 100644
--- a/src/security/PeerOptions.h
+++ b/src/security/PeerOptions.h
@@ -23,8 +23,8 @@ class PeerOptions
 {
 public:
     PeerOptions();
-    PeerOptions(const PeerOptions &);
-    PeerOptions &operator =(const PeerOptions &);
+    PeerOptions(const PeerOptions &) = default;
+    PeerOptions &operator =(const PeerOptions &) = default;
     virtual ~PeerOptions() {}
 
     /// parse a TLS squid.conf option
diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
index 28ee94ca83..0dcff346e7 100644
--- a/src/tests/stub_libsecurity.cc
+++ b/src/tests/stub_libsecurity.cc
@@ -74,8 +74,6 @@ Security::PeerOptions::PeerOptions() {
 #endif
      STUB_NOP
 }
-Security::PeerOptions::PeerOptions(const Security::PeerOptions &) {STUB}
-Security::PeerOptions &Security::PeerOptions::operator =(const Security::PeerOptions &) STUB_RETVAL(*this)
 void Security::PeerOptions::parse(char const*) STUB
 Security::ContextPointer Security::PeerOptions::createClientContext(bool) STUB_RETVAL(Security::ContextPointer())
 void Security::PeerOptions::updateTlsVersionLimits() STUB