From 077af137dee7de5ef470674b1d54b1146a5e8d15 Mon Sep 17 00:00:00 2001 From: shawn Date: Fri, 20 May 2016 04:39:29 -0400 Subject: [PATCH] AUTH: optimize header file dependency. same work as PR: https://github.com/ceph/ceph/pull/9193, https://github.com/ceph/ceph/pull/9161 Signed-off-by: Xiaowei Chen --- src/auth/Auth.h | 3 --- src/auth/AuthAuthorizeHandler.cc | 5 ----- src/auth/AuthAuthorizeHandler.h | 2 +- src/auth/AuthClientHandler.cc | 5 ----- src/auth/AuthClientHandler.h | 5 ----- src/auth/AuthMethodList.cc | 3 --- src/auth/AuthServiceHandler.cc | 2 -- src/auth/AuthServiceHandler.h | 1 - src/auth/AuthSessionHandler.cc | 1 - src/auth/AuthSessionHandler.h | 3 +-- src/auth/Crypto.cc | 5 ++--- src/auth/Crypto.h | 4 ++-- src/auth/KeyRing.cc | 5 ----- src/auth/KeyRing.h | 4 +--- src/auth/RotatingKeyRing.cc | 5 ----- src/auth/RotatingKeyRing.h | 4 +--- src/auth/cephx/CephxAuthorizeHandler.cc | 4 +--- src/auth/cephx/CephxAuthorizeHandler.h | 2 +- src/auth/cephx/CephxClientHandler.cc | 4 ++-- src/auth/cephx/CephxClientHandler.h | 4 +++- src/auth/cephx/CephxKeyServer.cc | 4 +--- src/auth/cephx/CephxKeyServer.h | 6 ++---- src/auth/cephx/CephxProtocol.h | 5 +---- src/auth/cephx/CephxServiceHandler.cc | 8 ++------ src/auth/cephx/CephxServiceHandler.h | 4 ++-- src/auth/cephx/CephxSessionHandler.cc | 4 ++-- src/auth/cephx/CephxSessionHandler.h | 5 +++-- src/auth/none/AuthNoneAuthorizeHandler.h | 2 +- src/auth/none/AuthNoneClientHandler.h | 8 ++++---- src/auth/none/AuthNoneProtocol.h | 2 +- src/auth/none/AuthNoneServiceHandler.h | 4 ++-- src/auth/none/AuthNoneSessionHandler.h | 6 ++---- src/auth/unknown/AuthUnknownAuthorizeHandler.cc | 3 --- src/auth/unknown/AuthUnknownAuthorizeHandler.h | 2 +- src/auth/unknown/AuthUnknownClientHandler.h | 2 +- src/auth/unknown/AuthUnknownProtocol.h | 2 +- src/auth/unknown/AuthUnknownServiceHandler.h | 4 ++-- src/auth/unknown/AuthUnknownSessionHandler.h | 4 ++-- src/tools/ceph_authtool.cc | 2 +- 39 files changed, 46 insertions(+), 102 deletions(-) diff --git a/src/auth/Auth.h b/src/auth/Auth.h index 12d49094b43..9dc88ffde8e 100644 --- a/src/auth/Auth.h +++ b/src/auth/Auth.h @@ -16,9 +16,6 @@ #define CEPH_AUTHTYPES_H #include "Crypto.h" -#include "msg/msg_types.h" - -#include "common/config.h" #include "common/entity_name.h" class Cond; diff --git a/src/auth/AuthAuthorizeHandler.cc b/src/auth/AuthAuthorizeHandler.cc index c9c25900894..e6e5eb997a6 100644 --- a/src/auth/AuthAuthorizeHandler.cc +++ b/src/auth/AuthAuthorizeHandler.cc @@ -12,16 +12,11 @@ * */ -#include "common/debug.h" -#include "Auth.h" #include "AuthAuthorizeHandler.h" #include "cephx/CephxAuthorizeHandler.h" #include "none/AuthNoneAuthorizeHandler.h" -#include "AuthMethodList.h" #include "common/Mutex.h" -#define dout_subsys ceph_subsys_auth - AuthAuthorizeHandler *AuthAuthorizeHandlerRegistry::get_handler(int protocol) { if (!supported.is_supported_auth(protocol)) { diff --git a/src/auth/AuthAuthorizeHandler.h b/src/auth/AuthAuthorizeHandler.h index 7b67876e44b..2e81f14abde 100644 --- a/src/auth/AuthAuthorizeHandler.h +++ b/src/auth/AuthAuthorizeHandler.h @@ -18,7 +18,7 @@ #include "Auth.h" #include "AuthMethodList.h" #include "include/types.h" - +#include "common/Mutex.h" // Different classes of session crypto handling #define SESSION_CRYPTO_NONE 0 diff --git a/src/auth/AuthClientHandler.cc b/src/auth/AuthClientHandler.cc index 5b02a258469..a76d1e4cc83 100644 --- a/src/auth/AuthClientHandler.cc +++ b/src/auth/AuthClientHandler.cc @@ -16,11 +16,6 @@ #include #include "AuthClientHandler.h" -#include "KeyRing.h" - -#include "messages/MAuth.h" -#include "messages/MAuthReply.h" - #include "cephx/CephxClientHandler.h" #include "none/AuthNoneClientHandler.h" diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h index 9b34a6f8270..0bebb74c447 100644 --- a/src/auth/AuthClientHandler.h +++ b/src/auth/AuthClientHandler.h @@ -17,13 +17,8 @@ #include "auth/Auth.h" - -#include "common/Mutex.h" -#include "common/Cond.h" #include "common/RWLock.h" -#include "common/Timer.h" - class CephContext; struct MAuthReply; class AuthClientHandler; diff --git a/src/auth/AuthMethodList.cc b/src/auth/AuthMethodList.cc index 0e507fbf43f..78b8858c078 100644 --- a/src/auth/AuthMethodList.cc +++ b/src/auth/AuthMethodList.cc @@ -13,9 +13,6 @@ */ #include - -#include "common/Mutex.h" -#include "common/config.h" #include "common/debug.h" #include "include/str_list.h" diff --git a/src/auth/AuthServiceHandler.cc b/src/auth/AuthServiceHandler.cc index 8e2d96618ba..bd265c4f0c9 100644 --- a/src/auth/AuthServiceHandler.cc +++ b/src/auth/AuthServiceHandler.cc @@ -15,8 +15,6 @@ #include "AuthServiceHandler.h" #include "cephx/CephxServiceHandler.h" #include "none/AuthNoneServiceHandler.h" -#include "AuthMethodList.h" -#include "common/config.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h index ccadbb0fa54..6bd8bd97634 100644 --- a/src/auth/AuthServiceHandler.h +++ b/src/auth/AuthServiceHandler.h @@ -16,7 +16,6 @@ #define CEPH_AUTHSERVICEHANDLER_H #include "include/types.h" -#include "common/config.h" #include "Auth.h" class CephContext; diff --git a/src/auth/AuthSessionHandler.cc b/src/auth/AuthSessionHandler.cc index e928cf74fe2..9734a5d5de8 100644 --- a/src/auth/AuthSessionHandler.cc +++ b/src/auth/AuthSessionHandler.cc @@ -17,7 +17,6 @@ #include "cephx/CephxSessionHandler.h" #include "none/AuthNoneSessionHandler.h" #include "unknown/AuthUnknownSessionHandler.h" -#include "common/config.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/AuthSessionHandler.h b/src/auth/AuthSessionHandler.h index b1f30a40067..d051750bcad 100644 --- a/src/auth/AuthSessionHandler.h +++ b/src/auth/AuthSessionHandler.h @@ -17,8 +17,6 @@ #define CEPH_AUTHSESSIONHANDLER_H #include "include/types.h" -#include "common/config.h" -#include "msg/Message.h" #include "Auth.h" #define SESSION_SIGNATURE_FAILURE -1 @@ -27,6 +25,7 @@ class CephContext; class KeyServer; +class Message; struct AuthSessionHandler { protected: diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc index 61b2ac88217..5ed9e88052e 100644 --- a/src/auth/Crypto.cc +++ b/src/auth/Crypto.cc @@ -27,13 +27,12 @@ #include "common/Clock.h" #include "common/armor.h" #include "common/ceph_crypto.h" -#include "common/config.h" -#include "common/debug.h" #include "common/hex.h" #include "common/safe_io.h" #include "include/ceph_fs.h" #include "include/compat.h" - +#include "common/Formatter.h" +#include "common/debug.h" #include int get_random_bytes(char *buf, int len) diff --git a/src/auth/Crypto.h b/src/auth/Crypto.h index 3bfc5aabd17..59ee8b3001c 100644 --- a/src/auth/Crypto.h +++ b/src/auth/Crypto.h @@ -18,8 +18,6 @@ #include "include/types.h" #include "include/utime.h" #include "include/memory.h" - -#include "common/Formatter.h" #include "include/buffer.h" #include @@ -27,6 +25,8 @@ class CephContext; class CryptoHandler; class CryptoKeyContext; +namespace ceph { class Formatter; } + /* * some per-key context that is specific to a particular crypto backend diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc index 8d5bdef379c..527076df025 100644 --- a/src/auth/KeyRing.cc +++ b/src/auth/KeyRing.cc @@ -17,15 +17,10 @@ #include #include #include - -#include "auth/AuthMethodList.h" -#include "auth/Crypto.h" #include "auth/KeyRing.h" -#include "common/ConfUtils.h" #include "common/config.h" #include "common/debug.h" #include "common/errno.h" -#include "include/str_list.h" #include "common/Formatter.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h index b69921c6500..f876a6a14c4 100644 --- a/src/auth/KeyRing.h +++ b/src/auth/KeyRing.h @@ -15,11 +15,9 @@ #ifndef CEPH_KEYRING_H #define CEPH_KEYRING_H -#include "common/config.h" - -#include "auth/Crypto.h" #include "auth/Auth.h" +class CephContext; class KeyRing : public KeyStore { map keys; diff --git a/src/auth/RotatingKeyRing.cc b/src/auth/RotatingKeyRing.cc index 9470801ff7d..ad0c0918de2 100644 --- a/src/auth/RotatingKeyRing.cc +++ b/src/auth/RotatingKeyRing.cc @@ -1,11 +1,6 @@ -#include #include -#include "common/config.h" #include "common/debug.h" -#include "include/str_list.h" - -#include "Crypto.h" #include "auth/RotatingKeyRing.h" #include "auth/KeyRing.h" diff --git a/src/auth/RotatingKeyRing.h b/src/auth/RotatingKeyRing.h index efcb6382c7f..762b55623c2 100644 --- a/src/auth/RotatingKeyRing.h +++ b/src/auth/RotatingKeyRing.h @@ -15,10 +15,7 @@ #ifndef CEPH_ROTATINGKEYRING_H #define CEPH_ROTATINGKEYRING_H -#include "common/config.h" #include "common/Mutex.h" - -#include "auth/Crypto.h" #include "auth/Auth.h" /* @@ -26,6 +23,7 @@ */ class KeyRing; +class CephContext; class RotatingKeyRing : public KeyStore { CephContext *cct; diff --git a/src/auth/cephx/CephxAuthorizeHandler.cc b/src/auth/cephx/CephxAuthorizeHandler.cc index 5b28b9e5ade..d455b190a99 100644 --- a/src/auth/cephx/CephxAuthorizeHandler.cc +++ b/src/auth/cephx/CephxAuthorizeHandler.cc @@ -1,8 +1,6 @@ - -#include "../KeyRing.h" - #include "CephxProtocol.h" #include "CephxAuthorizeHandler.h" +#include "common/dout.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/cephx/CephxAuthorizeHandler.h b/src/auth/cephx/CephxAuthorizeHandler.h index d17a692f71c..bf40d66e868 100644 --- a/src/auth/cephx/CephxAuthorizeHandler.h +++ b/src/auth/cephx/CephxAuthorizeHandler.h @@ -15,7 +15,7 @@ #ifndef CEPH_CEPHXAUTHORIZEHANDLER_H #define CEPH_CEPHXAUTHORIZEHANDLER_H -#include "../AuthAuthorizeHandler.h" +#include "auth/AuthAuthorizeHandler.h" class CephContext; diff --git a/src/auth/cephx/CephxClientHandler.cc b/src/auth/cephx/CephxClientHandler.cc index ff32a425757..a314608cc23 100644 --- a/src/auth/cephx/CephxClientHandler.cc +++ b/src/auth/cephx/CephxClientHandler.cc @@ -18,9 +18,9 @@ #include "CephxClientHandler.h" #include "CephxProtocol.h" -#include "../KeyRing.h" - +#include "auth/KeyRing.h" #include "common/config.h" +#include "common/dout.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix diff --git a/src/auth/cephx/CephxClientHandler.h b/src/auth/cephx/CephxClientHandler.h index d200ac990dc..d2f4506c947 100644 --- a/src/auth/cephx/CephxClientHandler.h +++ b/src/auth/cephx/CephxClientHandler.h @@ -15,10 +15,12 @@ #ifndef CEPH_CEPHXCLIENTHANDLER_H #define CEPH_CEPHXCLIENTHANDLER_H -#include "../AuthClientHandler.h" +#include "auth/AuthClientHandler.h" #include "CephxProtocol.h" +#include "auth/RotatingKeyRing.h" class CephContext; +class KeyRing; class CephxClientHandler : public AuthClientHandler { bool starting; diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc index 81c0a66b679..28b14375395 100644 --- a/src/auth/cephx/CephxKeyServer.cc +++ b/src/auth/cephx/CephxKeyServer.cc @@ -13,10 +13,8 @@ */ #include "common/config.h" - #include "CephxKeyServer.h" -#include "common/Timer.h" - +#include "common/dout.h" #include #define dout_subsys ceph_subsys_auth diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h index 7d95fadc882..76b1c136305 100644 --- a/src/auth/cephx/CephxKeyServer.h +++ b/src/auth/cephx/CephxKeyServer.h @@ -15,12 +15,10 @@ #ifndef CEPH_KEYSSERVER_H #define CEPH_KEYSSERVER_H -#include "common/config.h" - #include "auth/KeyRing.h" #include "CephxProtocol.h" - -#include "common/Timer.h" +#include "CephxKeyServer.h" +#include "common/Mutex.h" class CephContext; diff --git a/src/auth/cephx/CephxProtocol.h b/src/auth/cephx/CephxProtocol.h index 4a5fb5d3dcb..997ddeb77b4 100644 --- a/src/auth/cephx/CephxProtocol.h +++ b/src/auth/cephx/CephxProtocol.h @@ -83,10 +83,7 @@ #define CEPHX_REQUEST_TYPE_MASK 0x0F00 #define CEPHX_CRYPT_ERR 1 -#include "../Auth.h" -#include "../RotatingKeyRing.h" -#include "common/debug.h" - +#include "auth/Auth.h" #include #include diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc index 7b6212ab5b4..914fea71276 100644 --- a/src/auth/cephx/CephxServiceHandler.cc +++ b/src/auth/cephx/CephxServiceHandler.cc @@ -15,16 +15,12 @@ #include "CephxServiceHandler.h" #include "CephxProtocol.h" - -#include "../Auth.h" - -#include "mon/Monitor.h" - +#include "CephxKeyServer.h" #include #include #include "common/config.h" -#include "include/assert.h" +#include "common/debug.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h index 3649d3b5d57..968d6e16f29 100644 --- a/src/auth/cephx/CephxServiceHandler.h +++ b/src/auth/cephx/CephxServiceHandler.h @@ -15,8 +15,8 @@ #ifndef CEPH_CEPHXSERVICEHANDLER_H #define CEPH_CEPHXSERVICEHANDLER_H -#include "../AuthServiceHandler.h" -#include "../Auth.h" +#include "auth/AuthServiceHandler.h" +#include "auth/Auth.h" class KeyServer; diff --git a/src/auth/cephx/CephxSessionHandler.cc b/src/auth/cephx/CephxSessionHandler.cc index 30ed852ba6f..943b80afbd3 100644 --- a/src/auth/cephx/CephxSessionHandler.cc +++ b/src/auth/cephx/CephxSessionHandler.cc @@ -19,9 +19,9 @@ #include #include "common/config.h" -#include "include/assert.h" #include "include/ceph_features.h" - +#include "msg/Message.h" + #define dout_subsys ceph_subsys_auth int CephxSessionHandler::_calc_signature(Message *m, uint64_t *psig) diff --git a/src/auth/cephx/CephxSessionHandler.h b/src/auth/cephx/CephxSessionHandler.h index 7b46e076b8a..04184da45ba 100644 --- a/src/auth/cephx/CephxSessionHandler.h +++ b/src/auth/cephx/CephxSessionHandler.h @@ -13,10 +13,11 @@ */ -#include "../AuthSessionHandler.h" -#include "../Auth.h" +#include "auth/AuthSessionHandler.h" +#include "auth/Auth.h" class CephContext; +class Message; class CephxSessionHandler : public AuthSessionHandler { uint64_t features; diff --git a/src/auth/none/AuthNoneAuthorizeHandler.h b/src/auth/none/AuthNoneAuthorizeHandler.h index cc00d3d6cdb..256ad751e6b 100644 --- a/src/auth/none/AuthNoneAuthorizeHandler.h +++ b/src/auth/none/AuthNoneAuthorizeHandler.h @@ -15,7 +15,7 @@ #ifndef CEPH_AUTHNONEAUTHORIZEHANDLER_H #define CEPH_AUTHNONEAUTHORIZEHANDLER_H -#include "../AuthAuthorizeHandler.h" +#include "auth/AuthAuthorizeHandler.h" class CephContext; diff --git a/src/auth/none/AuthNoneClientHandler.h b/src/auth/none/AuthNoneClientHandler.h index 203687e4012..d78cfbc22ab 100644 --- a/src/auth/none/AuthNoneClientHandler.h +++ b/src/auth/none/AuthNoneClientHandler.h @@ -15,11 +15,11 @@ #ifndef CEPH_AUTHNONECLIENTHANDLER_H #define CEPH_AUTHNONECLIENTHANDLER_H -#include "../AuthClientHandler.h" +#include "auth/AuthClientHandler.h" #include "AuthNoneProtocol.h" - -class CephContext; - +#include "common/ceph_context.h" +#include "common/config.h" + class AuthNoneClientHandler : public AuthClientHandler { public: AuthNoneClientHandler(CephContext *cct_, RotatingKeyRing *rkeys) diff --git a/src/auth/none/AuthNoneProtocol.h b/src/auth/none/AuthNoneProtocol.h index a3c989128f6..3e84e5388ec 100644 --- a/src/auth/none/AuthNoneProtocol.h +++ b/src/auth/none/AuthNoneProtocol.h @@ -15,7 +15,7 @@ #ifndef CEPH_AUTHNONEPROTOCOL_H #define CEPH_AUTHNONEPROTOCOL_H -#include "../Auth.h" +#include "auth/Auth.h" struct AuthNoneAuthorizer : public AuthAuthorizer { AuthNoneAuthorizer() : AuthAuthorizer(CEPH_AUTH_NONE) { } diff --git a/src/auth/none/AuthNoneServiceHandler.h b/src/auth/none/AuthNoneServiceHandler.h index a45dbbfce4b..9fefd34dc21 100644 --- a/src/auth/none/AuthNoneServiceHandler.h +++ b/src/auth/none/AuthNoneServiceHandler.h @@ -15,8 +15,8 @@ #ifndef CEPH_AUTHNONESERVICEHANDLER_H #define CEPH_AUTHNONESERVICEHANDLER_H -#include "../AuthServiceHandler.h" -#include "../Auth.h" +#include "auth/AuthServiceHandler.h" +#include "auth/Auth.h" class CephContext; diff --git a/src/auth/none/AuthNoneSessionHandler.h b/src/auth/none/AuthNoneSessionHandler.h index 85261bf0fc1..36b7c744c31 100644 --- a/src/auth/none/AuthNoneSessionHandler.h +++ b/src/auth/none/AuthNoneSessionHandler.h @@ -12,10 +12,8 @@ * */ -#include "../AuthSessionHandler.h" -#include "../Auth.h" - -#define dout_subsys ceph_subsys_auth +#include "auth/AuthSessionHandler.h" +#include "msg/Message.h" class CephContext; diff --git a/src/auth/unknown/AuthUnknownAuthorizeHandler.cc b/src/auth/unknown/AuthUnknownAuthorizeHandler.cc index de66058c489..62cb638874e 100644 --- a/src/auth/unknown/AuthUnknownAuthorizeHandler.cc +++ b/src/auth/unknown/AuthUnknownAuthorizeHandler.cc @@ -13,9 +13,6 @@ */ #include "AuthUnknownAuthorizeHandler.h" -#include "common/debug.h" - -#define dout_subsys ceph_subsys_auth bool AuthUnknownAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *keys, bufferlist& authorizer_data, bufferlist& authorizer_reply, diff --git a/src/auth/unknown/AuthUnknownAuthorizeHandler.h b/src/auth/unknown/AuthUnknownAuthorizeHandler.h index 0156fbd85d9..a9003e12753 100644 --- a/src/auth/unknown/AuthUnknownAuthorizeHandler.h +++ b/src/auth/unknown/AuthUnknownAuthorizeHandler.h @@ -15,7 +15,7 @@ #ifndef CEPH_AUTHUNKNOWNAUTHORIZEHANDLER_H #define CEPH_AUTHUNKNOWNAUTHORIZEHANDLER_H -#include "../AuthAuthorizeHandler.h" +#include "auth/AuthAuthorizeHandler.h" class CephContext; diff --git a/src/auth/unknown/AuthUnknownClientHandler.h b/src/auth/unknown/AuthUnknownClientHandler.h index 088b816cb5b..b8158f326e2 100644 --- a/src/auth/unknown/AuthUnknownClientHandler.h +++ b/src/auth/unknown/AuthUnknownClientHandler.h @@ -15,7 +15,7 @@ #ifndef CEPH_AUTHUNKNOWNCLIENTHANDLER_H #define CEPH_AUTHUNKNOWNCLIENTHANDLER_H -#include "../AuthClientHandler.h" +#include "auth/AuthClientHandler.h" #include "AuthUnknownProtocol.h" class CephContext; diff --git a/src/auth/unknown/AuthUnknownProtocol.h b/src/auth/unknown/AuthUnknownProtocol.h index 94504fb9fc3..6781ef62f95 100644 --- a/src/auth/unknown/AuthUnknownProtocol.h +++ b/src/auth/unknown/AuthUnknownProtocol.h @@ -15,7 +15,7 @@ #ifndef CEPH_AUTHUNKNOWNPROTOCOL_H #define CEPH_AUTHUNKNOWNPROTOCOL_H -#include "../Auth.h" +#include "auth/Auth.h" struct AuthUnknownAuthorizer : public AuthAuthorizer { AuthUnknownAuthorizer() : AuthAuthorizer(CEPH_AUTH_UNKNOWN) { } diff --git a/src/auth/unknown/AuthUnknownServiceHandler.h b/src/auth/unknown/AuthUnknownServiceHandler.h index db039b6969f..573d01d21ec 100644 --- a/src/auth/unknown/AuthUnknownServiceHandler.h +++ b/src/auth/unknown/AuthUnknownServiceHandler.h @@ -15,8 +15,8 @@ #ifndef CEPH_AUTHUNKNOWNSERVICEHANDLER_H #define CEPH_AUTHUNKNOWNSERVICEHANDLER_H -#include "../AuthServiceHandler.h" -#include "../Auth.h" +#include "auth/AuthServiceHandler.h" +#include "auth/Auth.h" class CephContext; diff --git a/src/auth/unknown/AuthUnknownSessionHandler.h b/src/auth/unknown/AuthUnknownSessionHandler.h index 4f811ab52f1..80f27d362bd 100644 --- a/src/auth/unknown/AuthUnknownSessionHandler.h +++ b/src/auth/unknown/AuthUnknownSessionHandler.h @@ -12,8 +12,8 @@ * */ -#include "../AuthSessionHandler.h" -#include "../Auth.h" +#include "auth/AuthSessionHandler.h" +#include "msg/Message.h" #define dout_subsys ceph_subsys_auth diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc index a213391ff49..55692e5bae9 100644 --- a/src/tools/ceph_authtool.cc +++ b/src/tools/ceph_authtool.cc @@ -14,7 +14,7 @@ #include "common/ConfUtils.h" #include "common/ceph_argparse.h" - +#include "common/config.h" #include "global/global_context.h" #include "global/global_init.h" -- 2.39.5