mon/MonClient: remove unnecessary include

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index cc7e12b8b165fba83c1ebb5b92a1dcaacc071a20..0db52f8b49545906318b0e65937db131dd1b8c1c 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -56,6 +56,7 @@
 #include "messages/MCommandReply.h"
 
 #include "auth/AuthAuthorizeHandler.h"
+#include "auth/RotatingKeyRing.h"
 #include "auth/KeyRing.h"
 
 #include "common/config.h"

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 798b01ec140ddd5678a2cc8980f3754595d0c9a0..ebbb6056059c095454f2257dc5418188b06b84e5 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -13,6 +13,8 @@
 
 #include "DaemonServer.h"
 
+#include "auth/RotatingKeyRing.h"
+
 #include "messages/MMgrOpen.h"
 #include "messages/MMgrConfigure.h"
 #include "messages/MCommand.h"

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 1107e33eaedd8f2594beeac4e1d07686cc354a4b..029bf51134ba2cc19f69200568d958c4a21086be 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -35,6 +35,7 @@
 
 #include "auth/Auth.h"
 #include "auth/KeyRing.h"
+#include "auth/AuthClientHandler.h"
 #include "auth/AuthMethodList.h"
 #include "auth/RotatingKeyRing.h"
 

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 6081779721be02dba6178ccd27dad4d76ea0a550..3e3a10a744c00d57d4170b4bd3ab93e555e64559 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -24,8 +24,6 @@
 #include "common/Timer.h"
 #include "common/Finisher.h"
 #include "common/config.h"
-#include "auth/AuthClientHandler.h"
-#include "auth/RotatingKeyRing.h"
 
 
 class MMonMap;
@@ -38,8 +36,8 @@ class LogClient;
 struct AuthAuthorizer;
 class AuthMethodList;
 class AuthClientHandler;
-// class RotatingKeyRing;
 class KeyRing;
+class RotatingKeyRing;
 
 struct MonClientPinger : public Dispatcher {
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cc0329a811af9a1f4c465eb001ac3297ec3c1848..4f166b7f4dbef5811a92ac866454579ae1d9826e 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -130,6 +130,7 @@
 #include "osd/OpRequest.h"
 
 #include "auth/AuthAuthorizeHandler.h"
+#include "auth/RotatingKeyRing.h"
 #include "common/errno.h"
 
 #include "objclass/objclass.h"