]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
auth: authorizer for osd
authorYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 2 Oct 2009 23:12:59 +0000 (16:12 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Fri, 2 Oct 2009 23:12:59 +0000 (16:12 -0700)
src/osd/OSD.cc
src/osd/OSD.h

index 5df1a00a9dd2b72fcae9ed09801bfeea63deea8d..95cc8d8d9b2300b61fe102e00358e349c36b87c6 100644 (file)
@@ -233,6 +233,7 @@ OSD::OSD(int id, Messenger *m, Messenger *hbm, MonClient *mc, const char *dev, c
   logger(NULL),
   store(NULL),
   logclient(messenger, &mc->monmap),
+  authorizer(m, &keyring),
   whoami(id),
   dev_path(dev), journal_path(jdev),
   state(STATE_BOOTING), boot_epoch(0), up_epoch(0),
@@ -423,6 +424,8 @@ int OSD::init()
   messenger->add_dispatcher_head(&logclient);
 
   heartbeat_messenger->add_dispatcher_head(&heartbeat_dispatcher);
+
+  authorizer.init();
   
   monc->init();
 
index 26c29e0089ebeb2424255d92360163b485f6e388..83cab424950613a278e2136418189f55f0014b19 100644 (file)
@@ -32,6 +32,7 @@
 #include "include/LogEntry.h"
 
 #include "auth/KeyRing.h"
+#include "auth/AuthorizeServer.h"
 
 #include <map>
 using namespace std;
@@ -106,6 +107,9 @@ protected:
 
   KeyRing     keyring;
 
+  AuthorizeServer authorizer;
+
+
   int whoami;
   const char *dev_path, *journal_path;