From 4a530a12ac1ffae4e935f59262b62d893acb9751 Mon Sep 17 00:00:00 2001

From: Boris Ranto <branto@redhat.com>

Date: Mon, 22 Sep 2014 14:43:50 +0200

Subject: [PATCH] Limit the include scope -- do not (indirectly) include

 leveldb to ceph-conf and cephx authentication

---

 src/auth/cephx/CephxServiceHandler.cc | 3 +--

 src/tools/ceph_conf.cc                | 2 +-

 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc

index c5d91d9..77b9bb5 100644

--- a/src/auth/cephx/CephxServiceHandler.cc

+++ b/src/auth/cephx/CephxServiceHandler.cc

@@ -14,12 +14,11 @@

 #include "CephxServiceHandler.h"

+#include "CephxKeyServer.h"

 #include "CephxProtocol.h"

 #include "../Auth.h"

-#include "mon/Monitor.h"

-

 #include <errno.h>

 #include <sstream>

diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc

index 09bbc56..8cbfcbf 100644

--- a/src/tools/ceph_conf.cc

+++ b/src/tools/ceph_conf.cc

@@ -18,7 +18,7 @@

 #include <sys/stat.h>

 #include <sys/types.h>

-#include "mon/AuthMonitor.h"

+#include "mon/MonMap.h"

 #include "common/ConfUtils.h"

 #include "global/global_init.h"

 #include "common/entity_name.h"

-- 

1.9.3