auth,*: remove conflicting fwd declarations

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index feb19ccbfb7b7a0d523cc8165251aff8e9a26b30..7752d68dcaaa77bc5638fb80da47e056b41852be 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -21,6 +21,7 @@
 #include "common/Formatter.h"
 #include "include/buffer.h"
 #include "include/ceph_fs.h" // for CEPH_AUTH_UNKNOWN
+#include "include/common_fwd.h"
 
 #include <cstdint>
 #include <iostream>

diff --git a/src/auth/AuthClient.h b/src/auth/AuthClient.h
index fc102ebc107e8924116f0c3f5a2f2163c488edd4..c62dfbf9774d24668daac179410c5848a5f3741c 100644 (file)
--- a/src/auth/AuthClient.h
+++ b/src/auth/AuthClient.h
@@ -7,10 +7,10 @@
 #include <string>
 #include <vector>
 #include "include/buffer_fwd.h"
+#include "include/common_fwd.h"
 
 class AuthConnectionMeta;
 class Connection;
-class CryptoKey;
 
 class AuthClient {
 public:

diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
index 4b3dcccbe9dd26bd379d0b8f8ce1eeaeae63a198..39f17b81e91fa6939225b3684b9c0d20ad16d6ab 100644 (file)
--- a/src/auth/AuthServiceHandler.h
+++ b/src/auth/AuthServiceHandler.h
@@ -22,7 +22,6 @@
 #include "include/buffer_fwd.h"  // for ceph::buffer::list
 
 class KeyServer;
-class CryptoKey;
 struct AuthCapsInfo;
 
 enum class global_id_status_t {

diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
index 5f236fe3b00e0c0a58a6a43a25e029a723f95ba5..49acff731539175458e178eea15bc091453213a7 100644 (file)
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -52,9 +52,6 @@ namespace google_breakpad {
 
 class AdminSocket;
 class AdminSocketHook;
-class CryptoHandler;
-class CryptoManager;
-class CryptoRandom;
 class MonMap;
 
 namespace ceph::common {

diff --git a/src/crimson/auth/AuthClient.h b/src/crimson/auth/AuthClient.h
index 2d970c88c3cd070e42ac0e359dd402fe309c15e7..ce1388a16084220aaea6ec673a03ba07e6fd6888 100644 (file)
--- a/src/crimson/auth/AuthClient.h
+++ b/src/crimson/auth/AuthClient.h
@@ -8,10 +8,9 @@
 #include <tuple>
 #include <vector>
 #include "include/buffer_fwd.h"
+#include "include/common_fwd.h"
 #include "crimson/net/Fwd.h"
 
-class CryptoKey;
-
 namespace crimson::auth {
 
 class error : public std::logic_error {

diff --git a/src/include/common_fwd.h b/src/include/common_fwd.h
index 6b38e708f3d88be9e1d487b19d62923469e82ed2..41508ca3e3ba6685faaaed176f62c04874fa76f0 100644 (file)
--- a/src/include/common_fwd.h
+++ b/src/include/common_fwd.h
@@ -23,6 +23,7 @@ namespace TOPNSPC::common {
 namespace TOPNSPC::auth {
   class CryptoManager;
   class CryptoHandler;
+  class CryptoKeyHandler;
   class CryptoKey;
   class CryptoRandom;
 }
@@ -40,5 +41,6 @@ using TOPNSPC::common::RefCountedWaitObject;
 using TOPNSPC::common::ConfigProxy;
 using TOPNSPC::auth::CryptoManager;
 using TOPNSPC::auth::CryptoHandler;
+using TOPNSPC::auth::CryptoKeyHandler;
 using TOPNSPC::auth::CryptoKey;
 using TOPNSPC::auth::CryptoRandom;

diff --git a/src/msg/Dispatcher.h b/src/msg/Dispatcher.h
index c871a4543a012a20e37fdfd8b4fae85c7a971726..1efd4099452e0c74b0ee0994debc5b92bd117999 100644 (file)
--- a/src/msg/Dispatcher.h
+++ b/src/msg/Dispatcher.h
@@ -26,7 +26,6 @@
 
 class Messenger;
 class Connection;
-class CryptoKey;
 class KeyStore;
 
 class Dispatcher {