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 57be552acfba6415850c77d84f85b2f762fbf0b1..1969a25519a0467baca51d4a24e665a262810322 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -22,6 +22,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 17505e0f57416dd7d15d2038d360629a51ce31f4..b7125205b6e6c2c0b4da138270de0e5026c75704 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 2830e5b4ae5dcfbabfd398e5ce9ec47ba4c89f52..6388b2d800852c30e37ea2fe680f5beec6118844 100644 (file)
--- a/src/auth/AuthServiceHandler.h
+++ b/src/auth/AuthServiceHandler.h
@@ -23,7 +23,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 b51415ce1722f869cc05a9bcb0237065b0f4ecd0..4c89f46b0a3875e7feb8c29b2425eac388a6ac8a 100644 (file)
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -53,9 +53,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 b07759f7733747a1d8d1bf5e21f56661f46c1638..dbce4d1b79b54ca16a972aaf74a333289f12cb5a 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 25014e869a88a76de514b25824752ee531d14672..58fc628f7683b658e707e4ccb25d580a41947afc 100644 (file)
--- a/src/msg/Dispatcher.h
+++ b/src/msg/Dispatcher.h
@@ -27,7 +27,6 @@
 
 class Messenger;
 class Connection;
-class CryptoKey;
 class KeyStore;
 
 class Dispatcher {