From f6c19c4f444f7a818e4ae0dbeb257a5dd5bd07bf Mon Sep 17 00:00:00 2001
From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Fri, 14 Dec 2018 09:47:29 +0100
Subject: [PATCH] Explicitely avoid object copy for Semaphore,
 ChunkedSigningPipe, SingleThreadDistributor, and MultiThreadDistributor

---
 pdns/distributor.hh | 4 ++++
 pdns/signingpipe.hh | 2 ++
 pdns/utility.hh     | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index cf005127ca..aa53f64a11 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -62,6 +62,8 @@ template<class Answer, class Question, class Backend> class SingleThreadDistribu
     : public Distributor<Answer, Question, Backend>
 {
 public:
+  SingleThreadDistributor(const SingleThreadDistributor&) = delete;
+  void operator=(const SingleThreadDistributor&) = delete;
   SingleThreadDistributor();
   typedef std::function<void(Answer*)> callback_t;
   int question(Question *, callback_t callback) override; //!< Submit a question to the Distributor
@@ -85,6 +87,8 @@ template<class Answer, class Question, class Backend> class MultiThreadDistribut
     : public Distributor<Answer, Question, Backend>
 {
 public:
+  MultiThreadDistributor(const MultiThreadDistributor&) = delete;
+  void operator=(const MultiThreadDistributor&) = delete;
   MultiThreadDistributor(int n);
   typedef std::function<void(Answer*)> callback_t;
   int question(Question *, callback_t callback) override; //!< Submit a question to the Distributor
diff --git a/pdns/signingpipe.hh b/pdns/signingpipe.hh
index eb10b2fa60..06b53b6778 100644
--- a/pdns/signingpipe.hh
+++ b/pdns/signingpipe.hh
@@ -41,6 +41,8 @@ public:
   typedef vector<DNSZoneRecord> rrset_t; 
   typedef rrset_t chunk_t; // for now
   
+  ChunkedSigningPipe(const ChunkedSigningPipe&) = delete;
+  void operator=(const ChunkedSigningPipe&) = delete;
   ChunkedSigningPipe(const DNSName& signerName, bool mustSign, unsigned int numWorkers=3);
   ~ChunkedSigningPipe();
   bool submit(const DNSZoneRecord& rr);
diff --git a/pdns/utility.hh b/pdns/utility.hh
index d197c7c743..2672a18261 100644
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -64,6 +64,8 @@ private:
 
 protected:
 public:
+  Semaphore(const Semaphore&) = delete;
+  void operator=(const Semaphore&) = delete;
   //! Default constructor.
   Semaphore( unsigned int value = 0 );
 
-- 
2.47.2