From f8e2de893428594d281a3319093d38e2f18292b7 Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 9 Jun 2025 16:37:21 +0000
Subject: [PATCH] auth,*: remove conflicting fwd declarations

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

Conflicts:
	src/auth/Auth.h: include movement
---
 src/auth/Auth.h               | 10 ++++++++++
 src/auth/AuthClient.h         |  2 +-
 src/auth/AuthServiceHandler.h |  1 -
 src/common/ceph_context.h     |  3 ---
 src/crimson/auth/AuthClient.h |  3 +--
 src/include/common_fwd.h      |  2 ++
 src/msg/Dispatcher.h          |  1 -
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 83e23b34dbe..fc9c8026e91 100644
--- 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 c4ca019925f..3c0fde667ca 100644
--- 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 4b3dcccbe9d..39f17b81e91 100644
--- 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 103903f9838..15f07db43fd 100644
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -48,9 +48,6 @@
 
 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 2d970c88c3c..ce1388a1608 100644
--- 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 6b38e708f3d..41508ca3e3b 100644
--- 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 c871a4543a0..1efd4099452 100644
--- a/src/msg/Dispatcher.h
+++ b/src/msg/Dispatcher.h
@@ -26,7 +26,6 @@
 
 class Messenger;
 class Connection;
-class CryptoKey;
 class KeyStore;
 
 class Dispatcher {
-- 
2.39.5