auth,*: remove conflicting fwd declarations

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit c2d8e7127efd4391f64e19cd76e0f1b701289412)

Conflicts:
	src/auth/Auth.h: header include movement
	src/common/ceph_context.h: header include movement

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 83e23b34dbe3a0241aabda17cee706657ab711aa..fc9c8026e91f04ab55bb844662b082c5dec12126 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -18,6 +18,16 @@
 #include "Crypto.h"
 #include "common/ceph_json.h"
 #include "common/entity_name.h"
+#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>
+#include <list>
+#include <map>
+#include <string>
 
 // The _MAX values are a bit wonky here because we are overloading the first
 // byte of the auth payload to identify both the type of authentication to be

diff --git a/src/auth/AuthClient.h b/src/auth/AuthClient.h
index c4ca019925f7c94d6f7fd5d8481fa44a4f0b0ee7..3c0fde667caac872aa19e2d524edfd90df444a62 100644 (file)
--- a/src/auth/AuthClient.h
+++ b/src/auth/AuthClient.h
@@ -6,10 +6,10 @@
 #include <cstdint>
 #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 ea33fd737addefe9fbe7dbdcfdb0e0225fc20e56..d980b978aaa1d11c2d08e55baa57704558b2a44c 100644 (file)
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -50,6 +50,7 @@ class AdminSocket;
 class CryptoHandler;
 class CryptoManager;
 class CryptoRandom;
+class AdminSocketHook;
 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 05c1d8e9feb86eb6aed0c88779c2008a23bcb830..1b3ffc5e1ddaa0a3d824bb38f40be8e160eeb6c3 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 312336a79e629347a755742b078210cb3affd640..cd3834cf45518edc310621a5a7b9a6cac796ba70 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 {