From 1afa62e25324575fbe74071f9f70a50e466c4e24 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Wed, 26 Aug 2009 14:18:50 -0700
Subject: [PATCH] auth: move things around

---
 src/auth/AuthClientHandler.cc | 30 +-----------------------------
 src/librados.cc               |  4 ++--
 src/mon/MonClient.cc          |  2 +-
 src/mon/MonClient.h           |  5 ++++-
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/auth/AuthClientHandler.cc b/src/auth/AuthClientHandler.cc
index 864e1e693db7a..583d6f5fa5b9c 100644
--- a/src/auth/AuthClientHandler.cc
+++ b/src/auth/AuthClientHandler.cc
@@ -16,35 +16,7 @@
 #include <errno.h>
 
 #include "AuthProtocol.h"
-
-#include "config.h"
-
-
-
-#define AUTH_CAP_MON_ACCESS 0x01
-#define AUTH_CAP_OSD_ACCESS 0x02
-#define AUTH_CAP_MDS_ACCESS 0x04
-
-class AuthClientHandler {
-  int request_state;
-  int response_state;
-
-  bufferlist tgt;
-
-  uint32_t requested_caps;
-  int generate_auth_protocol_request(bufferlist& bl);
-  int handle_auth_protocol_response(bufferlist& bl);
-public:
-  AuthClientHandler() : requested_caps(0) {}
-  int get_caps(uint32_t flags) {
-    requested_caps = flags;
-    return 0;
-  }
-
-  int generate_request(bufferlist& bl);
-  int handle_response(bufferlist& bl);
-  
-};
+#include "AuthClientHandler.h"
 
 int AuthClientHandler::generate_request(bufferlist& bl)
 {
diff --git a/src/librados.cc b/src/librados.cc
index ebec459059ad8..8ec1673451d3b 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -302,8 +302,8 @@ bool RadosClient::init()
 
   monclient.mount(g_conf.client_mount_timeout);
 
-  dout(0) << "librados: before monclient.get_tgt()" << dendl;
-  monclient.get_tgt(g_conf.client_mount_timeout);
+  dout(0) << "librados: before monclient.authorize()" << dendl;
+  monclient.authorize(g_conf.client_mount_timeout);
 
   lock.Lock();
 
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 5157f14a6b74d..df2d8c4c6be46 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -211,7 +211,7 @@ int MonClient::unmount(double timeout)
   return unmount_handler.do_op(timeout);
 }
 
-int MonClient::get_tgt(double mount_timeout)
+int MonClient::authorize(double mount_timeout)
 {
   int ret = auth_handler.do_op(mount_timeout);
 
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 6db27486339bc..fbf15b1db5a47 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -22,6 +22,8 @@
 
 #include "common/Timer.h"
 
+#include "auth/AuthClientHandler.h"
+
 
 class MonMap;
 class MMonMap;
@@ -41,6 +43,7 @@ private:
   int mounters;
   bool unmounting;
   Cond mount_cond, map_cond;
+  AuthClientHandler auth_client_handler;
 
   bool dispatch_impl(Message *m);
   void handle_monmap(MMonMap *m);
@@ -158,7 +161,7 @@ private:
 
   int mount(double mount_timeout);
   int unmount(double timeout);
-  int get_tgt(double timeout);
+  int authorize(double timeout);
 
   void send_mon_message(Message *m, bool new_mon=false);
   void note_mon_leader(int m) {
-- 
2.39.5